merge detail fix