just pull based on current branch, don't force master