fix fail merge