Added another great line and deleted one dumb
Trying to create conflict
trying to create conflict from master
Merge branch 'testBranchToMerge1'
Merge branch 'master'