Fixed rebase and merge conflicts