More merge error fix .. on data model in project file