Cleaned merge conflicts in gradle.