Merge remote-tracking branch 'remotes/origin/master' into HEAD
Со спрингом удобнее. Ага :)