rebase master when pulled instead of merge