Added commit-remote.txt
fixed merge conflict on commit-remote.txt