fixed text
fixed merge conflicts