diff --git a/modules/python/init.zsh b/modules/python/init.zsh
index ed68990..91aa6d0 100644
--- a/modules/python/init.zsh
+++ b/modules/python/init.zsh
@@ -44,7 +44,7 @@ fi
 unset local_pyenv
 
 # Return if requirements are not found.
-if (( ! $#commands[(i)python[23]#] && ! $+functions[pyenv] )); then
+if (( ! $#commands[(i)python[23]#] && ! $+functions[pyenv] && ! $+commands[conda] )); then
   return 1
 fi
 
diff --git a/modules/utility/functions/diff b/modules/utility/functions/diff
index 4e08494..2e812f2 100644
--- a/modules/utility/functions/diff
+++ b/modules/utility/functions/diff
@@ -9,7 +9,7 @@
 
 if zstyle -t ':prezto:module:utility:diff' color \
       && (( $+commands[colordiff] )); then
-  command colordiff "$@"
+  command diff "$@" | colordiff
 else
   command diff "$@"
 fi