diff --git a/mocks/package-lock.json b/mocks/package-lock.json
index 7ffc78f..1fde4ff 100644
--- a/mocks/package-lock.json
+++ b/mocks/package-lock.json
@@ -3242,15 +3242,9 @@
       "peer": true
     },
     "@babel/register": {
-<<<<<<< HEAD
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/register/-/register-7.14.5.tgz",
-      "integrity": "sha512-TjJpGz/aDjFGWsItRBQMOFTrmTI9tr79CHOK+KIvLeCkbxuOAk2M5QHjvruIMGoo9OuccMh5euplPzc5FjAKGg==",
-=======
       "version": "7.16.0",
       "resolved": "https://registry.npmjs.org/@babel/register/-/register-7.16.0.tgz",
       "integrity": "sha512-lzl4yfs0zVXnooeLE0AAfYaT7F3SPA8yB2Bj4W1BiZwLbMS3MZH35ZvCWSRHvneUugwuM+Wsnrj7h0F7UmU3NQ==",
->>>>>>> master
       "dev": true,
       "requires": {
         "clone-deep": "^4.0.1",
@@ -3328,25 +3322,6 @@
       "dev": true
     },
     "@mocks-server/admin-api-paths": {
-<<<<<<< HEAD
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@mocks-server/admin-api-paths/-/admin-api-paths-2.1.0.tgz",
-      "integrity": "sha512-Ra3erEOR1hvNyCo8VP9q2dz1bwT4KBHQPqg7NYuMdQU3V+k1x6tZZz7puym7De57ID8q11iE+8uH/CSqWpVRWw==",
-      "dev": true
-    },
-    "@mocks-server/core": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@mocks-server/core/-/core-2.4.0.tgz",
-      "integrity": "sha512-SUmB0HCmw5WqQCjhWE6qr2bN0OGTKKXeDZ790e4E7q1FHnOGj7hmyu/TpBU7bwm0VnMeE7hVMkw3Gksr4BL4oA==",
-      "dev": true,
-      "requires": {
-        "@babel/register": "7.14.5",
-        "@hapi/boom": "9.1.2",
-        "ajv": "8.6.0",
-        "ajv-errors": "3.0.0",
-        "body-parser": "1.19.0",
-        "commander": "7.2.0",
-=======
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/@mocks-server/admin-api-paths/-/admin-api-paths-2.2.0.tgz",
       "integrity": "sha512-QQEW5igS8YlGgd288IKoibl7VIlLxMhxb4ckvjEgSHZwmljLF1pnhB7WIm5CIRhrOXJ8/ua7t4YUcekU4jxRJg==",
@@ -3364,16 +3339,11 @@
         "ajv-errors": "3.0.0",
         "body-parser": "1.19.0",
         "commander": "8.3.0",
->>>>>>> master
         "cors": "2.8.5",
         "express": "4.17.1",
         "express-request-id": "1.4.1",
         "fs-extra": "10.0.0",
-<<<<<<< HEAD
-        "globule": "1.3.2",
-=======
         "globule": "1.3.3",
->>>>>>> master
         "is-promise": "4.0.0",
         "lodash": "4.17.21",
         "md5": "2.3.0",
@@ -3381,46 +3351,6 @@
         "require-all": "3.0.0",
         "route-parser": "0.0.5",
         "winston": "3.3.3",
-<<<<<<< HEAD
-        "winston-array-transport": "1.1.4"
-      }
-    },
-    "@mocks-server/main": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@mocks-server/main/-/main-2.4.0.tgz",
-      "integrity": "sha512-pWIuoYh8HYa3yLBJcjxfru0lqZW8fmOXowz44+n2OoE3x2T4wFeONTzhmGlbthFqgVRUsU4/t2zdza+f0ctRuw==",
-      "dev": true,
-      "requires": {
-        "@mocks-server/core": "2.4.0",
-        "@mocks-server/plugin-admin-api": "2.1.0",
-        "@mocks-server/plugin-inquirer-cli": "2.1.0"
-      }
-    },
-    "@mocks-server/plugin-admin-api": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@mocks-server/plugin-admin-api/-/plugin-admin-api-2.1.0.tgz",
-      "integrity": "sha512-IqAYibzc39+6U5DzBicWH82dm4m28MZ9Gdrrm6kK75YU3kzQ9W5V7LRwVVZfkfHxYod48+GySH+SEVyPvXDKog==",
-      "dev": true,
-      "requires": {
-        "@hapi/boom": "9.1.2",
-        "@mocks-server/admin-api-paths": "2.1.0",
-        "express": "4.17.1"
-      }
-    },
-    "@mocks-server/plugin-inquirer-cli": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@mocks-server/plugin-inquirer-cli/-/plugin-inquirer-cli-2.1.0.tgz",
-      "integrity": "sha512-1bnh2LL6Ac9AuiXxmq5oOhQXfWNC8pnWJPr+C8KBhUBhwKM56D4tQ5csUMBcgmWJfH30ahjNZWVFaCQXPG6UnA==",
-      "dev": true,
-      "requires": {
-        "chalk": "4.1.1",
-        "inquirer": "8.1.0",
-        "inquirer-autocomplete-prompt": "1.3.0",
-        "lodash": "4.17.21",
-        "node-emoji": "1.10.0"
-      }
-    },
-=======
         "winston-array-transport": "1.1.5"
       }
     },
@@ -3510,7 +3440,6 @@
         }
       }
     },
->>>>>>> master
     "accepts": {
       "version": "1.3.7",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
@@ -3522,15 +3451,9 @@
       }
     },
     "ajv": {
-<<<<<<< HEAD
-      "version": "8.6.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.0.tgz",
-      "integrity": "sha512-cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ==",
-=======
       "version": "8.8.2",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.8.2.tgz",
       "integrity": "sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw==",
->>>>>>> master
       "dev": true,
       "requires": {
         "fast-deep-equal": "^3.1.1",
@@ -3578,15 +3501,9 @@
       "dev": true
     },
     "async": {
-<<<<<<< HEAD
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/async/-/async-3.2.1.tgz",
-      "integrity": "sha512-XdD5lRO/87udXCMC9meWdYiR+Nq6ZjUfXidViUZGu2F1MO4T3XwZ1et0hb2++BgLfhyJwy44BGB/yx80ABx8hg==",
-=======
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/async/-/async-3.2.2.tgz",
       "integrity": "sha512-H0E+qZaDEfx/FY4t7iLRv1W2fFI6+pyCeTw1uN20AQPiwqwM6ojPxHxdLv4z8hi2DtnW9BOckSspLucW7pIE5g==",
->>>>>>> master
       "dev": true
     },
     "balanced-match": {
@@ -3610,17 +3527,6 @@
         "buffer": "^5.5.0",
         "inherits": "^2.0.4",
         "readable-stream": "^3.4.0"
-<<<<<<< HEAD
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-          "dev": true
-        }
-=======
->>>>>>> master
       }
     },
     "body-parser": {
@@ -3668,8 +3574,6 @@
         "concat-map": "0.0.1"
       }
     },
-<<<<<<< HEAD
-=======
     "browserslist": {
       "version": "4.18.1",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.18.1.tgz",
@@ -3684,7 +3588,6 @@
         "picocolors": "^1.0.0"
       }
     },
->>>>>>> master
     "buffer": {
       "version": "5.7.1",
       "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
@@ -3715,15 +3618,9 @@
       "peer": true
     },
     "chalk": {
-<<<<<<< HEAD
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-=======
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
       "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
->>>>>>> master
       "dev": true,
       "peer": true,
       "requires": {
@@ -3754,15 +3651,9 @@
       }
     },
     "cli-spinners": {
-<<<<<<< HEAD
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.0.tgz",
-      "integrity": "sha512-t+4/y50K/+4xcCRosKkA7W4gTr1MySvLV0q+PxmG7FJ5g+66ChKurYjxBCjHggHH3HA5Hh9cy+lcUGWDqVH+4Q==",
-=======
       "version": "2.6.1",
       "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz",
       "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==",
->>>>>>> master
       "dev": true
     },
     "cli-width": {
@@ -3814,15 +3705,9 @@
       "dev": true
     },
     "color-string": {
-<<<<<<< HEAD
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.6.0.tgz",
-      "integrity": "sha512-c/hGS+kRWJutUBEngKKmk4iH3sD59MBkoxVapS/0wgpCz2u7XsNloxknyvBhzwEs1IbV36D9PwqLPJ2DTu3vMA==",
-=======
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.0.tgz",
       "integrity": "sha512-9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ==",
->>>>>>> master
       "dev": true,
       "requires": {
         "color-name": "^1.0.0",
@@ -3846,15 +3731,9 @@
       }
     },
     "commander": {
-<<<<<<< HEAD
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-=======
       "version": "8.3.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
       "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
->>>>>>> master
       "dev": true
     },
     "commondir": {
@@ -3947,15 +3826,6 @@
         "clone": "^1.0.2"
       }
     },
-    "defaults": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
-      "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
-      "dev": true,
-      "requires": {
-        "clone": "^1.0.2"
-      }
-    },
     "depd": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
@@ -4105,15 +3975,6 @@
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
       "dev": true
     },
-<<<<<<< HEAD
-    "fast-safe-stringify": {
-      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.8.tgz",
-      "integrity": "sha512-lXatBjf3WPjmWD6DpIZxkeSsCOwqI0maYMpgDlx8g4U2qi4lbjA9oH/HD2a87G+KfsUmo5WbJFmqBZlPxtptag==",
-      "dev": true
-    },
-=======
->>>>>>> master
     "fecha": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.1.tgz",
@@ -4321,15 +4182,9 @@
       "dev": true
     },
     "inquirer": {
-<<<<<<< HEAD
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.1.0.tgz",
-      "integrity": "sha512-1nKYPoalt1vMBfCMtpomsUc32wmOoWXAoq3kM/5iTfxyQ2f/BxjixQpC+mbZ7BI0JUXHED4/XPXekDVtJNpXYw==",
-=======
       "version": "8.2.0",
       "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.0.tgz",
       "integrity": "sha512-0crLweprevJ02tTuA6ThpoAERAGyVILC4sS74uib58Xf/zSr1/ZWtmm7D5CI+bSQEaA04f0K7idaHpQbSWgiVQ==",
->>>>>>> master
       "dev": true,
       "requires": {
         "ansi-escapes": "^4.2.1",
@@ -4340,15 +4195,9 @@
         "figures": "^3.0.0",
         "lodash": "^4.17.21",
         "mute-stream": "0.0.8",
-<<<<<<< HEAD
-        "ora": "^5.3.0",
-        "run-async": "^2.4.0",
-        "rxjs": "^6.6.6",
-=======
         "ora": "^5.4.1",
         "run-async": "^2.4.0",
         "rxjs": "^7.2.0",
->>>>>>> master
         "string-width": "^4.1.0",
         "strip-ansi": "^6.0.0",
         "through": "^2.3.6"
@@ -4553,8 +4402,6 @@
       "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
       "dev": true
     },
-<<<<<<< HEAD
-=======
     "js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -4569,7 +4416,6 @@
       "dev": true,
       "peer": true
     },
->>>>>>> master
     "json-schema-traverse": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
@@ -4685,16 +4531,6 @@
         }
       }
     },
-    "log-symbols": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
-      "dev": true,
-      "requires": {
-        "chalk": "^4.1.0",
-        "is-unicode-supported": "^0.1.0"
-      }
-    },
     "logform": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/logform/-/logform-2.3.0.tgz",
@@ -4762,20 +4598,6 @@
       "dev": true
     },
     "mime-db": {
-<<<<<<< HEAD
-      "version": "1.49.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.49.0.tgz",
-      "integrity": "sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA==",
-      "dev": true
-    },
-    "mime-types": {
-      "version": "2.1.32",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.32.tgz",
-      "integrity": "sha512-hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A==",
-      "dev": true,
-      "requires": {
-        "mime-db": "1.49.0"
-=======
       "version": "1.51.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
       "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==",
@@ -4788,7 +4610,6 @@
       "dev": true,
       "requires": {
         "mime-db": "1.51.0"
->>>>>>> master
       }
     },
     "mimic-fn": {
@@ -4916,8 +4737,6 @@
         "log-symbols": "^4.1.0",
         "strip-ansi": "^6.0.0",
         "wcwidth": "^1.0.1"
-<<<<<<< HEAD
-=======
       },
       "dependencies": {
         "ansi-styles": {
@@ -4969,7 +4788,6 @@
             "has-flag": "^4.0.0"
           }
         }
->>>>>>> master
       }
     },
     "os-tmpdir": {
@@ -5488,15 +5306,9 @@
       }
     },
     "winston-array-transport": {
-<<<<<<< HEAD
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/winston-array-transport/-/winston-array-transport-1.1.4.tgz",
-      "integrity": "sha512-Uf/hSP0IT4SKvd7LEpSgzUGsHiv9n3+qVerGcpV6vjZfYGlXkCM2875W1rjxqjxfY1wGrHfRv3YS625nSNf+Pw==",
-=======
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/winston-array-transport/-/winston-array-transport-1.1.5.tgz",
       "integrity": "sha512-aEMKZwpJZvfOwFXbiIdwlLPv0GWmMNVnFBtQeV2SQhhtCbHSNVACVdBAJnAzxbb/+AsRkUM0/B3CxnD9bjMUsQ==",
->>>>>>> master
       "dev": true,
       "requires": {
         "winston-transport": "4.4.0"
diff --git a/mocks/package.json b/mocks/package.json
index 164b72c..b71d738 100644
--- a/mocks/package.json
+++ b/mocks/package.json
@@ -7,10 +7,6 @@
     "mocks:ci": "mocks-server --no-cli"
   },
   "devDependencies": {
-<<<<<<< HEAD
-    "@mocks-server/main": "2.4.0"
-=======
     "@mocks-server/main": "2.5.0"
->>>>>>> master
   }
 }