Add commit-remote.txt
Create commit-remote.txt in master branch
Add updated commit-remote.txt with conflicts resolved to master branch version