added more text
fixed conflict