Debug html generation
Fix merge conflicts