html conflict resolved