project file updates for merge