How to Resolve Conflicts in GitHub Code