diff --git a/src/com/projectkorra/projectkorra/ability/api/AirAbility.java b/src/com/projectkorra/projectkorra/ability/api/AirAbility.java
index 537f8796..20252d41 100644
--- a/src/com/projectkorra/projectkorra/ability/api/AirAbility.java
+++ b/src/com/projectkorra/projectkorra/ability/api/AirAbility.java
@@ -20,6 +20,14 @@ public abstract class AirAbility extends CoreAbility {
 		return "Air";
 	}
 
+<<<<<<< HEAD
+=======
+	@Override
+	public final ChatColor getElementColor() {
+		return getAirColor();
+	}
+
+>>>>>>> Add new CoreAbility API, Add BendingPlayer methods
 	/**
 	 * Gets the AirColor from the config.
 	 * 
diff --git a/src/com/projectkorra/projectkorra/ability/api/CoreAbility.java b/src/com/projectkorra/projectkorra/ability/api/CoreAbility.java
index b57f9cdc..abe50889 100644
--- a/src/com/projectkorra/projectkorra/ability/api/CoreAbility.java
+++ b/src/com/projectkorra/projectkorra/ability/api/CoreAbility.java
@@ -1,6 +1,5 @@
 package com.projectkorra.projectkorra.ability.api;
 
-import com.projectkorra.projectkorra.SubElement;
 import com.projectkorra.projectkorra.configuration.ConfigManager;
 
 import org.bukkit.ChatColor;
@@ -98,7 +97,6 @@ public abstract class CoreAbility implements Ability {
 		if (playerMap.size() == 0) {
 			classMap.remove(playerMap);
 		}
-
 		CoreAbility.instancesByClass.get(getClass()).remove(this);
 	}