change message
fixed conflict