comit_merge2