fix conflits

Author: sitatec

README.md

@@ -1,6 +1,6 @@
 # firebase_database_mocks
 
-[![Pub Version](https://img.shields.io/pub/v/firebase_database_mocks)](https://pub.dev/packages/firebase_database_mocks)
+[![Pub Version](https://img.shields.io/pub/v/firebase_database_mocks)](https://pub.dev/packages/firebase_database_mocks) [![style: effective dart](https://img.shields.io/badge/style-pedantic-blue)](https://github.com/google/pedantic)
 
 Mocks library to write unit tests for FirebaseDatabase (real-time database). Get Instance
 `MockFirebaseDatabase.instance`, then pass it around your project as if it were a

pubspec.lock

@@ -42,7 +42,7 @@ packages:
       name: build
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.6.0"
+    version: "1.6.1"
   built_collection:
     dependency: transitive
     description:
@@ -91,7 +91,7 @@ packages:
       name: code_builder
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.5.0"
+    version: "3.6.0"
   collection:
     dependency: transitive
     description:

pubspec.yaml

@@ -1,4 +1,5 @@
 name: firebase_database_mocks
+
 description: Fakes to write unit tests for FirebaseDatabase (real-time database). Get Instance MockFirebaseDatabase.instance, then pass it around your project as if it were a FirebaseDatabase.instance. This mock keep data in memory while test running.
 
 version: 0.1.0