drop conflict artefact from merge