added html guide tags
merged html conflicts