Fix merge branch in pull

The merge was happening against a local branch rather than the remote branch.