working on html generation
fix conflict