fixed inheritance
merged index.html
merge