diff --git a/setup/db/create-schema.sql b/setup/db/create-schema.sql
index 96dc7b9d839..72e40b38e25 100755
--- a/setup/db/create-schema.sql
+++ b/setup/db/create-schema.sql
@@ -2182,7 +2182,6 @@ CREATE TABLE  `cloud`.`netscaler_pod_ref` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 
-<<<<<<< HEAD
 CREATE TABLE `cloud`.`vpc` (
   `id` bigint unsigned NOT NULL auto_increment COMMENT 'id',
   `uuid` varchar(40) NOT NULL,