updated merge with new html