build.gradle resolve conflict