googs merge build fix