changed cool.html
merge