remove git conflict string in properties file