fixed merge issues for uiutils.py