Fix merge conflicts between my and Noah's HomeController shenanigans.