Merging build changes