change bye
fixed conflict