Added debugging for groovy
Merged conflicts