Merge branches before building on CI.
Merge pull request #18 from alphagov/merge-branches-on-ci

Merge branches before building on CI.