 $$
 
 CREATE OR REPLACE PROCEDURE
-<<<<<<< HEAD
   add_routes_monitoring_urls_to_environments()
-=======
-  rename_keyValue_to_key_value_in_ssh_key()
->>>>>>> master
-
-  BEGIN
-
-    IF NOT EXISTS(
-              SELECT NULL
-                FROM INFORMATION_SCHEMA.COLUMNS
-<<<<<<< HEAD
+  BEGIN
+
+    IF NOT EXISTS(
+              SELECT NULL
+                FROM INFORMATION_SCHEMA.COLUMNS
               WHERE table_name = 'environment'
                 AND table_schema = 'infrastructure'
                 AND column_name = 'lagoon_route'

      ALTER TABLE `environment` ADD `lagoon_route`    varchar(300);
      ALTER TABLE `environment` ADD `lagoon_routes`   text;
      ALTER TABLE `environment` ADD `monitoring_urls` text;
=======
               WHERE table_name = 'ssh_key'
                 AND table_schema = 'infrastructure'
                 AND column_name = 'key_value'

CALL add_subfolder_to_project();
CALL delete_project_pattern_from_openshift();
CALL add_openshift_project_pattern_to_project();
CALL add_routes_monitoring_urls_to_environments();
CALL rename_keyValue_to_key_value_in_ssh_key();
CALL rename_keyType_to_key_type_in_ssh_key();
CALL rename_openshift_projectname_in_environment();
