removed merge artefact