clean up index.html by adding partial
fix merge conflicts