Add Jeremy's builder code to sidestep merge conf