bug 10253322 -- do a merge locally instead of using the pull request reference r=aki