Merge branches before building on CI.

Reduces bugs on master arising from post-test merges.
It's also useful to know whether the tests pass independently of knowing whether there's a merge conflict.