Made changes to HomeController
Changed the same line as in other branch
Resolved merge conflict