Fixing merge artefact