Updated text
Fixed merge conflicts + changed a few more lines of text