diff --git a/procfile b/procfile
index d5888b3..7832b05 100644
--- a/procfile
+++ b/procfile
@@ -1,5 +1 @@
-<<<<<<< HEAD
-node:yarn start 
-=======
 node:yarn start
->>>>>>> 253463c2f8a6348609ea2bc6cf2992c3e2125f41