Fix merged build.