Update master-template.php
Update home.php
Update boot.php
Merge conflicts