1st commit (eclipse)
Merge remote-tracking branch 'origin/master'