Remove merge conflicts artefacts