removing the properties file for conflicts