After many hours of wanting to kill myself and matthew's family, we figured out spell checking and suggestions with hyperlinks(exclamation mark). Yay.
merge conflicts probably resolved hopefully