bootstrap
conflict fix
scrap maps
added html