Reconciled concurrent changes to home.html