diff --git a/src/controller.c b/src/controller.c
index 74c13b1..b2dfe13 100644
--- a/src/controller.c
+++ b/src/controller.c
@@ -46,8 +46,16 @@ int FCFSDirection()
 
 bus_query_t *FCFSQuery()
 {
-<<<<<<< HEAD
-    return NULL;
+    bus_query_t *p = queries;
+    if (the_bus->rail_node_pos == p->node)
+    {
+        return p;
+    }
+    else
+    { 
+        queries = queries->next_node;
+        return NULL;
+    }
 }
 
 bus_query_t *SSTFGetQuery()
@@ -78,16 +86,4 @@ int SCANDirection(bus_query_t *target_query)
 bus_query_t *SCANBTWQuery()
 {
     return NULL;
-=======
-    bus_query_t *p = queries;
-    if (the_bus->rail_node_pos == p->node)
-    {
-        return p;
-    }
-    else
-    { 
-        queries = queries->next_node;
-        return NULL;
-    }
->>>>>>> dev
 }
\ No newline at end of file