Merge build fix