fix merging of remote pull requests