first commit to commit-remote.txt
first commit of commit-remote to the master branch
fixed merge conflict