Removing test 3 phrase
Testing conflicts
Modifying a different file than it has conflicts
Merging branch with conflicts