Merge branch 'master' of C:\grails\oros with conflicts.
Merge remote-tracking branch 'origin/master'
remove http builder