Fix merge2
Fix merge2