html conflicts resolved