diff --git a/src/net/milkbowl/vault/Vault.java b/src/net/milkbowl/vault/Vault.java
index 20d6369..63f5d06 100644
--- a/src/net/milkbowl/vault/Vault.java
+++ b/src/net/milkbowl/vault/Vault.java
@@ -93,11 +93,7 @@ public class Vault extends JavaPlugin {
         }
 
         // Try to load BOSEconomy
-<<<<<<< HEAD
         if (packageExists(new String[] { "cosine.boseconomy.BOSEconomy", "cosine.boseconomy.CommandManager" })) {
-=======
-        if (packageExists(new String[] { "cosine.boseconomy.BOSEconomy" })) {
->>>>>>> upstream/master
             Economy bose6 = new Economy_BOSE6(this);
             getServer().getServicesManager().register(net.milkbowl.vault.economy.Economy.class, bose6, this, ServicePriority.Normal);
             log.info(String.format("[%s][Economy] BOSEconomy6 found: %s", getDescription().getName(), bose6.isEnabled() ? "Loaded" : "Waiting"));
diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_BOSE7.java b/src/net/milkbowl/vault/economy/plugins/Economy_BOSE7.java
index 8dd5520..22aa4f4 100644
--- a/src/net/milkbowl/vault/economy/plugins/Economy_BOSE7.java
+++ b/src/net/milkbowl/vault/economy/plugins/Economy_BOSE7.java
@@ -196,15 +196,9 @@ public class Economy_BOSE7 implements Economy {
     @Override
     public String format(double amount) {
         if (amount == 1) {
-<<<<<<< HEAD
             return String.format("%.0f %s", amount, getMoneyNameSingular());
         } else {
             return String.format("%.2f %s", amount, getMoneyNamePlural());
-=======
-            return String.format("%f %s", amount, getMoneyNameSingular());
-        } else {
-            return String.format("%f %s", amount, getMoneyNamePlural());
->>>>>>> upstream/master
         }
     }
 }