Fixed strange merge artefacting.