Merge branches before building on CI.

Reduces bugs on master arising from post-test merges.
Fair concern, but github will indicate that the branch can't be merged cleanly, so there shouldn't be any risk of it getting merged anyway (assuming we all use the github buttons to merge).  We're using this approach in several other repos already, and I think it's fine.