go fix merge files