fetch in between edits
Merge remote-tracking branch 'origin/master'
commit and fetch before testing
conflicts merged
testing complete