diff --git a/game2048/.pytest_cache/v/cache/lastfailed b/game2048/.pytest_cache/v/cache/lastfailed
index 967c276b4e4d14636a2b884c8559d9459d51122c..d82b887957e97fc8f8da49cba457af361a317e93 100644
--- a/game2048/.pytest_cache/v/cache/lastfailed
+++ b/game2048/.pytest_cache/v/cache/lastfailed
@@ -1,4 +1,4 @@
 {
-  "test_grid_2048.py": true,
-  "test_grid_2048.py::test_grid_to_string": true
+  "test_grid_2048.py::test_grid_to_string": true,
+  "test_grid_2048.py::test_move_row_right": true
 }
\ No newline at end of file
diff --git a/game2048/.pytest_cache/v/cache/nodeids b/game2048/.pytest_cache/v/cache/nodeids
index 20085cbe7f08628362c50b9967c6eb64071d0d07..6a3242b42e252a2fd3dda40bae2981f4f01ceeab 100644
--- a/game2048/.pytest_cache/v/cache/nodeids
+++ b/game2048/.pytest_cache/v/cache/nodeids
@@ -1,3 +1,3 @@
 [
-  "test_grid_2048.py::test_create_grid"
+  "test_grid_2048.py::test_move_row_left"
 ]
\ No newline at end of file
diff --git a/game2048/grid_2048.py b/game2048/grid_2048.py
index c6694f046173c0f5731c11efdcfddda5eac504b2..71c7455d63c02761ab8b5947dec63d87e3db7da3 100644
--- a/game2048/grid_2048.py
+++ b/game2048/grid_2048.py
@@ -87,8 +87,6 @@ def grid_to_string_with_size_and_theme(grid, theme,n):
 def long_value_with_theme(grid,theme):
     return max(len(theme[v]) for v in get_all_tiles(grid))
 
-<<<<<<< HEAD
-
 
 #FONCTIONNALITE 4
 
@@ -117,4 +115,9 @@ def move_row_left(row):
     return new_row + [0]*(n - len(new_row))
 
 def move_row_right(row):
-    return move_row_left(row[-1:])[-1:]
+    return move_row_left(row[::-1])[::-1]
+
+# FONCTIONNALITE 5
+
+def is_grid_full(grid):
+    return get_empty_tiles_positions(grid) == []
diff --git a/game2048/test_grid_2048.py b/game2048/test_grid_2048.py
index 82a2333bd405fca0e671073760edc8f3362d34e1..0c038931c55e70a2a6c55dc3ec8df77c79d13494 100644
--- a/game2048/test_grid_2048.py
+++ b/game2048/test_grid_2048.py
@@ -80,6 +80,10 @@ def test_move_row_right():
     assert move_row_right([2, 2, 2, 2]) == [0, 0, 4, 4]
     assert move_row_right([4, 2, 0, 2]) == [0, 0, 4, 4]
     assert move_row_right([2, 0, 0, 2]) == [0, 0, 0, 4]
-    assert move_row_right[2, 4, 2, 2]) == [0, 2, 4, 4]
+    assert move_row_right([2, 4, 2, 2]) == [0, 2, 4, 4]
     assert move_row_right([2, 4, 4, 0]) == [0, 0, 2, 8]
     assert move_row_right([4, 8, 16, 32]) == [4, 8, 16, 32]
+
+def test_is_grid_full():
+    assert is_grid_full([[0, 16, 32, 0], [64, 0, 32, 2], [2, 2, 8, 4], [512, 8, 16, 0]]) == False
+    assert is_grid_full([[4, 16, 32, 4], [64, 8, 32, 2], [2, 2, 8, 4], [512, 8, 16, 1024]]) == True