Fixed merge conflicts in ui.py