.properties updates
fixed conflict
fixed conflict