now merging with current branch instead of a pull