Update gradle.properties

Removing git conflict stuff