Create mariner.txt
Merge branch 'feature2'
add local change
Merge branch 'master' of https://github.com/bjwallace/gitadvanced