Merge into master before building
Also update commit status if base branch changed