Getting rid of git merging residue