Commiting project file changes
Merge remote-tracking branch 'origin/fixes'