Clean up traces of merge