Merge branches before building on CI.

Reduces bugs on master arising from post-test merges.