Rebase conflicts in ui. Fixes #17