Make the CI perform a merge before building

This (hopefully) prevents us from fucking up the upstream branches.