Fixed merge error in HomeController