diff --git a/src/code/ca/bcit/comp2522/lab02/LowRageException.java b/src/code/ca/bcit/comp2522/lab02/LowRageException.java
index e3a9c32..985089c 100644
--- a/src/code/ca/bcit/comp2522/lab02/LowRageException.java
+++ b/src/code/ca/bcit/comp2522/lab02/LowRageException.java
@@ -9,17 +9,9 @@ package ca.bcit.comp2522.lab02;
  * @author Trishaan Shetty
  * @version 1.0.0
  */
-<<<<<<< HEAD
+
 public class LowRageException extends Exception
 {
-=======
-public class LowRageException extends Exception {
-
-    /**
-     * LowRageException constructor
-     * @param message LowRageException error message
-     */
->>>>>>> 95139d77e5ef179a1fdf39684f766170502c6138
     public LowRageException(final String message) {
         super(message);
     }