updating html and urls
fixing merge conflict