Gradle magic
Fixed conflict