From 2ba361e75b398a9ef767c8cb771373ccef33a31f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Kazeroni?=
 <70641264+remi-kazeroni@users.noreply.github.com>
Date: Wed, 22 Jun 2022 13:49:50 +0200
Subject: [PATCH 1/3] Update CONTRIBUTING.md

---
 CONTRIBUTING.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ca129146..796b0ac8 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -129,7 +129,6 @@ please preview changes on your machine before submitting a
 [pull request][PR]. To do so, you need to install
 the software described below:
 
->>>>>>> main
 ```bash
 # apt (Ubuntu/Devian)
 sudo apt install ruby-dev ruby-bundler

From 6db2ed476f7b3b776834ad3bc2d3cff049c80329 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Kazeroni?=
 <70641264+remi-kazeroni@users.noreply.github.com>
Date: Wed, 22 Jun 2022 13:53:25 +0200
Subject: [PATCH 2/3] Update reference.md

Co-authored-by: SarahAlidoost <55081872+SarahAlidoost@users.noreply.github.com>
---
 reference.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reference.md b/reference.md
index ee2704b8..45fbc25c 100644
--- a/reference.md
+++ b/reference.md
@@ -5,7 +5,7 @@ layout: reference
 ## Glossary
 
 
-## Refences:
+## References:
 
 [ESMValTool main website](https://www.esmvaltool.org/)
 

From b1a2e8511ad27428ae47262326efaf9fa3e383da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Kazeroni?=
 <70641264+remi-kazeroni@users.noreply.github.com>
Date: Wed, 22 Jun 2022 13:54:05 +0200
Subject: [PATCH 3/3] Update 03-configuration.md

---
 _episodes/03-configuration.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/_episodes/03-configuration.md b/_episodes/03-configuration.md
index b3d0827b..551645e0 100644
--- a/_episodes/03-configuration.md
+++ b/_episodes/03-configuration.md
@@ -38,7 +38,6 @@ You can get the default configuration file by running:
 ~~~bash
   esmvaltool config get_config_user --path=<target_dir>
 ~~~
-
 The default configuration file will be downloaded to the directory specified with 
 the `--path` variable. For instance, you can provide the path to your working directory 
 as the `target_dir`. If this option is not used, the file will be saved to the default