added text
fixed conflict