conflicts in html solved