Add commit-remote text file
Create new commit-remote file with different text
Resolve conflict to master branch version of commit-remote file