Adding HTML outputs
Fix merge conflict