Clean up of merge errors