Different indents for HTML and Go
Add dockerfile bundle
Update bundles
Fix conflict