Fixing rebase