Try to fix merge2