updating project file
new commits
merging