Fix leftover merge conflict in build.gradle