fixing pull / rebase aftermath