Added commit-remote.txt
added a file to show a conflict
resolved conflict in commit-remote.txt