Fixing bad merge after rebase