VCS in IDEA configured to use Git
Merge remote-tracking branch 'origin/master'