Merge should be complete, and able to build.