html update
up to date

resolved some conflicts