consumers html page is done
conflicts resolved