adding content to commit-remote.txt
adding commit-remote.txt
resolve the merge conflict to master