修正merge