fixed merge conflict in commit-remote.txt