add project file
merge from baseline
update project file