Fixing rebase problem