created TestMergeConflict.txt file
Merge remote-tracking branch 'origin/master'