fixed merge error in home.html