update rebase to always take master's changes