Added commit-remote.txt
Added commit-remote.txt
Fixed conflict in commit-remote.txt