commit-remote.txt
commit-remote in master
Merge branch 'feature-branch-remote'
in master
deleted commit-remote.txt
added an exclamation point
commit-remote in master
resolved the conflict