Remove conflict markup remnants
Clean up more from merge