diff --git a/JShellAPI/build.gradle b/JShellAPI/build.gradle
index 7a2380b..a465f8b 100644
--- a/JShellAPI/build.gradle
+++ b/JShellAPI/build.gradle
@@ -36,4 +36,4 @@ shadowJar {
     archiveBaseName.set('JShellPlaygroundBackend')
     archiveClassifier.set('')
     archiveVersion.set('')
-}
\ No newline at end of file
+}
diff --git a/JShellWrapper/build.gradle b/JShellWrapper/build.gradle
index 279e8c0..debf2c9 100644
--- a/JShellWrapper/build.gradle
+++ b/JShellWrapper/build.gradle
@@ -41,4 +41,4 @@ shadowJar {
     archiveBaseName.set('JShellWrapper')
     archiveClassifier.set('')
     archiveVersion.set('')
-}
\ No newline at end of file
+}
diff --git a/build.gradle b/build.gradle
index 81ebaa4..7866283 100644
--- a/build.gradle
+++ b/build.gradle
@@ -64,7 +64,12 @@ subprojects {
     }
 
     dependencies {
+<<<<<<< HEAD
         testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
         testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
+=======
+        testImplementation 'org.junit.jupiter:junit-jupiter:5.8.1'
+        testImplementation 'org.junit.jupiter:junit-jupiter:5.8.1'
+>>>>>>> 1a41fc8 (Merge to master (#20))
     }
 }