commit-remote in feature-branch-remote
commit remote in master
updated the file
Merge branch 'feature-branch-remote'
Second addition to commit-remote
Merge branch 'master' into feature-branch-remote
third line
changed a bunch of stuff
made changes in master
changed remote hopefully for conflict
resolved merge conflict
added commit 3