google / go conflict fix