local.properties
fix merge conflict for local.properties