home.html had some bad merges