Fix merge conflicts manually with widgets.py