Cleaning up artefacts from merge errors