removed html
fixing merge