Fixing rebase merge errors