show infomedia html
fix merge conflicts