Merging in building changes