diff --git a/src/utils/firebase.js b/src/utils/firebase.js
index 409e96e..6ea833b 100644
--- a/src/utils/firebase.js
+++ b/src/utils/firebase.js
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-=======
-
->>>>>>> dbe6428087ba866fb5051a8a46b3085ff5cc5f6a
 import firebase from 'firebase'
 import "firebase/storage";