altered html file
solved merge conflict