Added groovy for gradle
fixed conflicts