getting rid of git conflict residue