diff --git a/shared/resource/jsons/dic_army_wishReward.json b/shared/resource/jsons/dic_army_wishReward.json
index a1f202c63..7190a5233 100644
--- a/shared/resource/jsons/dic_army_wishReward.json
+++ b/shared/resource/jsons/dic_army_wishReward.json
@@ -20,243 +20,16 @@
     {
         "id": 4,
         "itid": 41,
-<<<<<<< Updated upstream
-        "quality": 1,
-        "honourReward": 20,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0
-    },
-    {
-        "id": 5,
-        "itid": 41,
-        "quality": 2,
-        "honourReward": 50,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0
-    },
-    {
-        "id": 6,
-        "itid": 41,
-        "quality": 3,
-        "honourReward": 70,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0
-    },
-    {
-        "id": 7,
-        "itid": 41,
-        "quality": 4,
-        "honourReward": 80,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0
-    },
-    {
-        "id": 8,
-        "itid": 41,
-        "quality": 1,
-        "honourReward": 40,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0
-    },
-    {
-        "id": 9,
-        "itid": 41,
-=======
->>>>>>> Stashed changes
         "quality": 2,
         "honourReward": 20
     },
     {
-<<<<<<< Updated upstream
-        "id": 10,
-        "itid": 41,
-        "quality": 3,
-        "honourReward": 90,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0
-    },
-    {
-        "id": 11,
-        "itid": 41,
-        "quality": 4,
-        "honourReward": 110,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0
-    },
-    {
-        "id": 12,
-        "itid": 41,
-        "quality": 1,
-        "honourReward": 70,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0
-    },
-    {
-        "id": 13,
-        "itid": 41,
-        "quality": 2,
-        "honourReward": 100,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": " "
-    },
-    {
-        "id": 14,
-        "itid": 41,
-        "quality": 3,
-        "honourReward": 130,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0
-    },
-    {
-        "id": 15,
-        "itid": 41,
-        "quality": 4,
-        "honourReward": 140,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0
-    },
-    {
-        "id": 16,
-        "itid": 41,
-        "quality": 1,
-        "honourReward": 120,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0
-    },
-    {
-        "id": 17,
-        "itid": 41,
-        "quality": 2,
-        "honourReward": 160,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0
-    },
-    {
-        "id": 18,
-        "itid": 41,
-        "quality": 3,
-        "honourReward": 190,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0
-    },
-    {
-        "id": 19,
-        "itid": 41,
-        "quality": 4,
-        "honourReward": 210,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0
-    },
-    {
-        "id": 20,
-        "itid": 41,
-        "quality": 1,
-        "honourReward": 150,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0
-    },
-    {
-        "id": 21,
-        "itid": 41,
-        "quality": 2,
-        "honourReward": 200,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0
-    },
-    {
-        "id": 22,
-=======
         "id": 5,
->>>>>>> Stashed changes
         "itid": 41,
         "quality": 3,
         "honourReward": 50
     },
     {
-<<<<<<< Updated upstream
-        "id": 23,
-        "itid": 41,
-        "quality": 4,
-        "honourReward": 240,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0
-    },
-    {
-        "id": 24,
-        "itid": 41,
-        "quality": 1,
-        "honourReward": 170,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0
-    },
-    {
-        "id": 25,
-        "itid": 41,
-        "quality": 2,
-        "honourReward": 230,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0
-    },
-    {
-        "id": 26,
-        "itid": 41,
-        "quality": 3,
-        "honourReward": 260,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0
-    },
-    {
-        "id": 27,
-        "itid": 41,
-        "quality": 4,
-        "honourReward": 330,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0
-=======
         "id": 6,
         "itid": 41,
         "quality": 4,
@@ -267,6 +40,5 @@
         "itid": 41,
         "quality": 5,
         "honourReward": 80
->>>>>>> Stashed changes
     }
 ]
\ No newline at end of file