处理了FCFSQuery函数中的冲突

src/controller.c

@@ -46,6 +46,7 @@ int FCFSDirection()
 
 bus_query_t *FCFSQuery()
 {
+<<<<<<< HEAD
     return NULL;
 }
 
@@ -77,4 +78,16 @@ 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
 }