Fixed conflicts & updated html file as well