Resolved merge conflicts in home.blade.php
