fix merge error (Ext->Ext2)