change homecontroller.php
fix merge conflict in HomeController.php