removed git conflicts in html