Removed unresolved conflicts in HTML