fix merge
add logo, html arabic lang