fix(): resolve merge conflicts

Author: kamilmysliwiec

Readme.md

@@ -9,7 +9,7 @@
     <p align="center">
 <a href="https://www.npmjs.com/~nestjscore" target="_blank"><img src="https://img.shields.io/npm/v/@nestjs/core.svg" alt="NPM Version" /></a>
 <a href="https://www.npmjs.com/~nestjscore" target="_blank"><img src="https://img.shields.io/npm/l/@nestjs/core.svg" alt="Package License" /></a>
-<a href="https://www.npmjs.com/~nestjscore" target="_blank"><img src="https://img.shields.io/npm/dm/@nestjs/core.svg" alt="NPM Downloads" /></a>
+<a href="https://www.npmjs.com/~nestjscore" target="_blank"><img src="https://img.shields.io/npm/dm/@nestjs/common.svg" alt="NPM Downloads" /></a>
 <a href="https://circleci.com/gh/nestjs/nest" target="_blank"><img src="https://img.shields.io/circleci/build/github/nestjs/nest/master" alt="CircleCI" /></a>
 <a href="https://coveralls.io/github/nestjs/nest?branch=master" target="_blank"><img src="https://coveralls.io/repos/github/nestjs/nest/badge.svg?branch=master#9" alt="Coverage" /></a>
 <a href="https://discord.gg/G7Qnnhy" target="_blank"><img src="https://img.shields.io/badge/discord-online-brightgreen.svg" alt="Discord"/></a>

integration/graphql/package-lock.json

@@ -9,10 +9,10 @@
     "start:prod": "node dist/main.js"
   },
   "dependencies": {
-    "@nestjs/common": "6.11.6",
-    "@nestjs/core": "6.11.6",
+    "@nestjs/common": "6.11.7",
+    "@nestjs/core": "6.11.7",
     "@nestjs/graphql": "6.5.4",
-    "apollo-server-express": "2.10.0",
+    "apollo-server-express": "2.10.1",
     "graphql": "14.6.0",
     "graphql-tools": "4.0.6",
     "reflect-metadata": "0.1.13",

integration/graphql/package.json

@@ -7,11 +7,11 @@
     "start": "ts-node src/main"
   },
   "dependencies": {
-    "@nestjs/common": "6.11.6",
-    "@nestjs/core": "6.11.6",
-    "@nestjs/microservices": "6.11.6",
-    "@nestjs/testing": "6.11.6",
-    "@nestjs/websockets": "6.11.6",
+    "@nestjs/common": "6.11.7",
+    "@nestjs/core": "6.11.7",
+    "@nestjs/microservices": "6.11.7",
+    "@nestjs/testing": "6.11.7",
+    "@nestjs/websockets": "6.11.7",
     "class-transformer": "0.2.3",
     "class-validator": "0.11.0",
     "fastify": "2.10.0",

integration/hello-world/package-lock.json

@@ -7,8 +7,8 @@
     "start": "ts-node src/main"
   },
   "dependencies": {
-    "@nestjs/common": "6.11.6",
-    "@nestjs/core": "6.11.6",
+    "@nestjs/common": "6.11.7",
+    "@nestjs/core": "6.11.7",
     "class-transformer": "0.2.3",
     "class-validator": "0.11.0",
     "reflect-metadata": "0.1.13",