added commit-remote.txt
fixed merge conflict