clearing merge conflict junk from files