added text back
fixed conflict