Resolved conflict from HomeController