my gradle build changed
merge resolved for build.gradle