Removing merge artefacts