Try git rebase with origin/master