i think i indented or something
fixing merge conflict
added body paragraph to messages
merging with ana