resolve the merge conflict on commit-remote.txt