I'm glad you figured out how to overcome merge conflicts, but you should also delete the text you don't want to keep in the conflicted files, along with the <<<HEAD, etc markers :)