add bootstrap and html shell
fix conflicts