fixed merge2
fixed merge2