diff --git a/core_function.txt b/core_function.txt
index 1247e11..9234fee 100644
--- a/core_function.txt
+++ b/core_function.txt
@@ -1,2 +1,6 @@
 // Start code here.
+<<<<<<< HEAD
+function update_order()
+=======
 function create_order()
+>>>>>>> dev