Rebase branch with master