Merge conflict inbound

Altered home and index