Moved fast-forward merge above rebase