diff --git a/pyproject.toml b/pyproject.toml
index 317af14..8b3c124 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -10,6 +10,7 @@ requires-python = ">=3.6"
 [[project.authors]]
 name = "Luis Torres"
 email = "luistorres@flywheel.io"
+<<<<<<< HEAD
 
 [[project.authors]]
 name = "Steven Sourbron"
@@ -18,6 +19,16 @@ email = "s.sourbron@sheffield.ac.uk"
 [project.license]
 file = "LICENSE"
 
+=======
+
+[[project.authors]]
+name = "Steven Sourbron"
+email = "s.sourbron@sheffield.ac.uk"
+
+[project.license]
+file = "LICENSE"
+
+>>>>>>> bcd0dd872bbc4c6ec6a97e583e212d065045a274
 [project.urls]
 Homepage = "https://osipi.github.io/pypi"