diff --git a/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java b/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java
index b49df7fbb2c..54f2b0ea654 100755
--- a/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java
+++ b/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java
@@ -57,12 +57,9 @@ import com.cloud.agent.api.SecStorageFirewallCfgCommand;
 import com.cloud.agent.api.SecStorageFirewallCfgCommand.PortConfig;
 import com.cloud.agent.api.SecStorageSetupAnswer;
 import com.cloud.agent.api.SecStorageSetupCommand;
-<<<<<<< HEAD
-=======
 import com.cloud.agent.api.SecStorageSetupCommand.Certificates;
 import com.cloud.agent.api.StartupSecondaryStorageCommand;
 import com.cloud.agent.api.SecStorageFirewallCfgCommand.PortConfig;
->>>>>>> 0776447... bug 13470: add cert chain in db, and also open the api to upload a cert chain
 import com.cloud.agent.api.SecStorageVMSetupCommand;
 import com.cloud.agent.api.StartupCommand;
 import com.cloud.agent.api.StartupSecondaryStorageCommand;
diff --git a/server/src/com/cloud/upgrade/dao/Upgrade2213to2214.java b/server/src/com/cloud/upgrade/dao/Upgrade2213to2214.java
index a289e31bac4..20abfc7e31f 100644
--- a/server/src/com/cloud/upgrade/dao/Upgrade2213to2214.java
+++ b/server/src/com/cloud/upgrade/dao/Upgrade2213to2214.java
@@ -94,6 +94,7 @@ public class Upgrade2213to2214 implements DbUpgrade {
 	@Override
 	public void performDataMigration(Connection conn) {
 		fixIndexes(conn);
+		upgradeCerts(conn);
 	}
 
 	@Override