Fixed rebase merge