Logic to handle conflicts
Autogenerated
remove service.properties