Removed duplicate HTML from previous merge conflict