editing files that had merge conflicts