added unorderd list to doctype
fixed all merge problems