diff --git a/datashuttle/datashuttle.py b/datashuttle/datashuttle.py
index 969eac6f..a37d88df 100644
--- a/datashuttle/datashuttle.py
+++ b/datashuttle/datashuttle.py
@@ -188,10 +188,9 @@ def create_folders(
             If `True`, folders will be created even if they are not
             valid to NeuroBlueprint style.
 
-<<<<<<< HEAD
         log : bool
             If `True`, details of folder creation will be logged.
-=======
+
         Returns
         -------
         created_paths :
@@ -201,7 +200,6 @@ def create_folders(
             created, the dict keys will separate created folders by datatype
             name. Similarly, if only subject or session level folders were
             created, these are separated by "sub" and "ses" keys.
->>>>>>> 612b276 (Add 'Returns' section to 'create_folders()', fix incorrect type hints.)
 
         Notes
         -----