Added fucking great string!
Trying to create conflict
Merge branch 'testBranchToMerge1'
Merge branch 'master'