fixed merge2