diff --git a/src/code/ca/bcit/comp2522/lab02/Creature.java b/src/code/ca/bcit/comp2522/lab02/Creature.java
index 0aa95ad..b410606 100644
--- a/src/code/ca/bcit/comp2522/lab02/Creature.java
+++ b/src/code/ca/bcit/comp2522/lab02/Creature.java
@@ -9,7 +9,8 @@ package ca.bcit.comp2522.lab02;
  * @author Trishaan Shetty
  * @version 1.0.0
  */
-public class Creature {
+public class Creature
+{
 
     private static final int MIN_HEALTH = 1;
     private static final int MAX_HEALTH = 100;
@@ -162,7 +163,8 @@ public class Creature {
      *
      * @return details of the creature.
      */
-    public String getDetails() {
+    public String getDetails()
+    {
         StringBuilder builder;
 
         builder = new StringBuilder();
diff --git a/src/code/ca/bcit/comp2522/lab02/Dragon.java b/src/code/ca/bcit/comp2522/lab02/Dragon.java
index 2f72ec4..c291b51 100644
--- a/src/code/ca/bcit/comp2522/lab02/Dragon.java
+++ b/src/code/ca/bcit/comp2522/lab02/Dragon.java
@@ -9,7 +9,8 @@ package ca.bcit.comp2522.lab02;
  * @author Trishaan Shetty
  * @version 1.0.0
  */
-public class Dragon extends Creature {
+public class Dragon extends Creature
+{
 
     private static final int MAX_FIRE_POWER = 100;
     private static final int MIN_FIRE_POWER = 0;
@@ -61,10 +62,11 @@ public class Dragon extends Creature {
      * @return details of dragon
      */
     @Override
-    public String getDetails() {
+    public String getDetails()
+    {
+
 
         final StringBuilder builder;
-
         builder = new StringBuilder();
 
         builder.append("Is alive: "       + this.isAlive());
@@ -74,6 +76,7 @@ public class Dragon extends Creature {
         builder.append(" Health: "        + this.getHealth());
         builder.append(" FirePower: "     + this.firePower);
 
+
         return builder.toString();
 
     }
@@ -110,7 +113,8 @@ public class Dragon extends Creature {
      *
      * @param amount to increase firePower
      */
-    protected void restoreFirePower(final int amount) {
+    protected void restoreFirePower(final int amount)
+    {
 
         this.firePower += amount;
 
diff --git a/src/code/ca/bcit/comp2522/lab02/HealingException.java b/src/code/ca/bcit/comp2522/lab02/HealingException.java
index f360318..a4f2a50 100644
--- a/src/code/ca/bcit/comp2522/lab02/HealingException.java
+++ b/src/code/ca/bcit/comp2522/lab02/HealingException.java
@@ -9,12 +9,8 @@ package ca.bcit.comp2522.lab02;
  * @author Trishaan Shetty
  * @version 1.0.0
  */
-public class HealingException extends RuntimeException {
-
-    /**
-     * HealingException constructor
-     * @param message HealingException error message
-     */
+public class HealingException extends RuntimeException
+{
     public HealingException(final String message) {
         super(message);
     }
diff --git a/src/code/ca/bcit/comp2522/lab02/LowFirePowerException.java b/src/code/ca/bcit/comp2522/lab02/LowFirePowerException.java
index 4c30b6e..3b72027 100644
--- a/src/code/ca/bcit/comp2522/lab02/LowFirePowerException.java
+++ b/src/code/ca/bcit/comp2522/lab02/LowFirePowerException.java
@@ -9,12 +9,9 @@ package ca.bcit.comp2522.lab02;
  * @author Trishaan Shetty
  * @version 1.0.0
  */
-public class LowFirePowerException extends Exception {
+public class LowFirePowerException extends Exception
+{
 
-    /**
-     * LowFirePowerException constructor
-     * @param message LowFirePowerException error message
-     */
     public LowFirePowerException(final String message) {
         super(message);
     }
diff --git a/src/code/ca/bcit/comp2522/lab02/LowRageException.java b/src/code/ca/bcit/comp2522/lab02/LowRageException.java
index d704063..e3a9c32 100644
--- a/src/code/ca/bcit/comp2522/lab02/LowRageException.java
+++ b/src/code/ca/bcit/comp2522/lab02/LowRageException.java
@@ -9,12 +9,17 @@ 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);
     }