solved conflicts on widget.html