Imported project into STS (Eclipse)
Merge remote-tracking branch 'origin/master'