fixing rebase artefacts