diff --git a/procfile b/procfile
index 438525c..d5888b3 100644
--- a/procfile
+++ b/procfile
@@ -1 +1,5 @@
-node:yarn start 
\ No newline at end of file
+<<<<<<< HEAD
+node:yarn start 
+=======
+node:yarn start
+>>>>>>> 253463c2f8a6348609ea2bc6cf2992c3e2125f41