fetch
Delete .project
Delete .project
Merge remote-tracking branch 'upstream/master'