remove merge artefacts