I cleaned up the build.gradle
Merge branch 'working'