Inclusion of Gradle
Fixed conflicts