Commented out the wrong sections of code from a merge conflict in controller; left in the commented code in case I'm wrong about which was correct.