fix conflict from previous commit

Author: Theo Geddes

_episodes/04-recipe.md

@@ -82,13 +82,9 @@ Let's dissect what's happening here.
  `~/esmvaltool_tutorial/config-user.yml`.
 > > 1. ESMValTool found the recipe in its installation directory, something like
 > >    `/home/users/username/miniconda3/envs/esmvaltool/bin/esmvaltool/recipes/examples/`
-<<<<<<< HEAD
 >> or if you are using a pre-installed module on a server, something like
- `/apps/jasmin/community/esmvaltool/ESMValTool_2.5.0/esmvaltool/recipes
-/examples/recipe_python.yml`
-=======
->> or if you are using a pre-installed module on a server, something like `/apps/jasmin/community/esmvaltool/ESMValTool_2.6.0/esmvaltool/recipes/examples/recipe_python.yml`
->>>>>>> main
+ `/apps/jasmin/community/esmvaltool/ESMValTool_<version>/esmvaltool/recipes
+/examples/recipe_python.yml`, where `<version>` is the latest release.
 > > 1. ESMValTool creates a time-stamped output directory for every run. In this
 > >    case, it should be something like `recipe_python_YYYYMMDD_HHMMSS`. This
 > >    folder is made inside the output directory specified in the previous