fix(controller): fix up merge conflicts
feat(controller): log domain removal
style(controller): fix flake8