resolved conflict with HomeController on GitHub