Trying to fix up conflicts
Removing local.properties