EA_MODEL Fixed error in merge