diff --git a/request.sql b/request.sql
index 8468dfb..7f8c797 100644
--- a/request.sql
+++ b/request.sql
@@ -1,10 +1,7 @@
 
 --         | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20 | 21 |
 -- --------+---+---+---+---+---+---+---+---+---+----+----+----+----+----+----+----+----+----+----+----+----+
-<<<<<<< HEAD
--- Axel    |   |   | O | O |   |   |   |   |   |    |    | x  | O  |    |    |    |    |    |    |    |    |
-=======
--- Axel    |   |   | O | O |   |   |   |   |   |    |    | x  | x  |    |    |    |    |    |    |    |    |
+-- Axel    |   |   | O | O |   |   |   |   |   |    |    | O  | O  |    |    |    |    |    |    |    |    |
 -- --------+---+---+---+---+---+---+---+---+---+----+----+----+----+----+----+----+----+----+----+----+----+
 -- Ronan   |   | O |   |   |   | O |   |   |   | O  |    |    |    |    |    | x  |    |    |    |    |    |
 -- --------+---+---+---+---+---+---+---+---+---+----+----+----+----+----+----+----+----+----+----+----+----+