diff --git a/src/main/java/resources/CalculatorResource.java b/src/main/java/resources/CalculatorResource.java
index 47202779787c627be7186eaaacb7118b625b68b8..5712a798cbe315637d0b34089b59ddb0ee3fc114 100644
--- a/src/main/java/resources/CalculatorResource.java
+++ b/src/main/java/resources/CalculatorResource.java
@@ -1,9 +1,5 @@
 package resources;
 
-<<<<<<< HEAD
-import org.graalvm.compiler.hotspot.stubs.DivisionByZeroExceptionStub;
-=======
->>>>>>> 2ffc5ca1cddf44a1e6d380f18eb4b10bb4578efb
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;