fixed a merge conflict artefact