first commit on branch
added conflicting commit-remote.txt
Merge branch 'feature-branch-remote'
new file