More dumb conflicts (advancedUI/Refactor)