fixed text
fixed author
fixed conflict