Sharing .project
A merge operation
Merge remote-tracking branch 'origin/master'