resolve conflict: untangle is now C-c i
Removed Deft mode

Did not work because the package was not added to the cask file.
Anyway, it is completely redundant to org mode.