Update project file
Merge