project file update
removed excess merge files