clearing merge conflict junk in file