diff --git a/README.md b/README.md
index 097c8073934cb733234e38bbdc108d05a4007d4c..0ebb064aacffb947ad86de54de5a621b0f4624b5 100644
--- a/README.md
+++ b/README.md
@@ -28,6 +28,7 @@ Training material for the Git for Beginners ABiMS training session
   1. Displaying information about a local repository
   1. Making changes to the local repository
   1. Propagating changes to the remote repository
+  1. Resolving conflicts
 
 ### Branching Basics
   1. Default branches
@@ -40,7 +41,6 @@ Training material for the Git for Beginners ABiMS training session
   1. Branch Protection
   1. Submitting Merge Requests
   1. Handling Merge Requests
-  1. Resolving Conflicts
 
 ### Using Git through third party tools
   1. Using Git inside R-Studio
diff --git a/gitcli-basics/README.md b/gitcli-basics/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391