actually fixed home.html merge