fix strange merge artefacts