further work to resolve conflict in html page