Resolve merge conflict in home.html