fix: figured out some merge issues.

Some code was missing from files and I had to go into .erb files and fix them.