Redo build process changes that got lost or overwritten in the branch merge.