working dengerous set innerhtml
fixing merge conflict