adding changes to html
merged changes