Merge build changes.