Removes the merge conflict syntax and our content >>>>>> our content... ====== their content <<<<<< commit name