diff --git a/FlippR-Driver/contrib/json_example/input/Input_Matrix_Config.json b/FlippR-Driver/contrib/json_example/input/Input_Matrix_Config.json
index afb858c..00ed848 100644
--- a/FlippR-Driver/contrib/json_example/input/Input_Matrix_Config.json
+++ b/FlippR-Driver/contrib/json_example/input/Input_Matrix_Config.json
@@ -3,7 +3,6 @@
     "input_matrix" :
     [
         {
-<<<<<<< HEAD
             "name" : "Tilt 2",
             "address" : 2,
             "priority" : 2
@@ -35,347 +34,187 @@
         },
         {
             "name" : "Outhole",
-=======
-            "name" : "Outhole",
-            "name_datasheeet" : "Out hole",
->>>>>>> 362bbd9d368f163913e3f942e6b6006e50881b8f
             "address" : 16,
             "priority" : 99,
             "bounce_time" : 10
         },
         {
             "name" : "Left Outlane",
-<<<<<<< HEAD
-=======
-            "name_datasheeet" : "Left outer exit canal",
->>>>>>> 362bbd9d368f163913e3f942e6b6006e50881b8f
             "address" : 17,
             "priority" : 2
         },
         {
             "name" : "Left Inlane",
-<<<<<<< HEAD
-=======
-            "name_datasheeet" : "Inner left canal",
->>>>>>> 362bbd9d368f163913e3f942e6b6006e50881b8f
             "address" : 18,
             "priority" : 2
         },
         {
             "name" : "Left Slingshot",
-<<<<<<< HEAD
-=======
-            "name_datasheeet" : "Left flap contacts",
->>>>>>> 362bbd9d368f163913e3f942e6b6006e50881b8f
             "address" : 19,
             "priority" : 2
         },
         {
             "name" : "Right Slingshot",
-<<<<<<< HEAD
-=======
-            "name_datasheeet" : "Right flap contacts",
->>>>>>> 362bbd9d368f163913e3f942e6b6006e50881b8f
             "address" : 20,
             "priority" : 2
         },
         {
             "name" : "Right Inlane",
-<<<<<<< HEAD
-=======
-            "name_datasheeet" : "Right inner canal",
->>>>>>> 362bbd9d368f163913e3f942e6b6006e50881b8f
             "address" : 21,
             "priority" : 2
         },
         {
             "name" : "Right Outlane",
-<<<<<<< HEAD
-=======
-            "name_datasheeet" : "Right central exit canal",
->>>>>>> 362bbd9d368f163913e3f942e6b6006e50881b8f
             "address" : 22,
             "priority" : 2
         },
         {
             "name" : "Right Outlane Kicker",
-<<<<<<< HEAD
-=======
-            "name_datasheeet" : "Right kicker contact",
->>>>>>> 362bbd9d368f163913e3f942e6b6006e50881b8f
             "address" : 23,
             "priority" : 2
         },
         {
-<<<<<<< HEAD
             "name" : "Rebound Contact",
-=======
-            "name" : "  Rebound Contact",
-            "name_datasheeet" : "Contacts",
->>>>>>> 362bbd9d368f163913e3f942e6b6006e50881b8f
             "address" : 24,
             "priority" : 2
         },
         {
             "name" : "Left Bank Left",
-<<<<<<< HEAD
-=======
-            "name_datasheeet" : "1st moving target bottom left bank",
->>>>>>> 362bbd9d368f163913e3f942e6b6006e50881b8f
             "address" : 25,
             "priority" : 2
         },
         {
             "name" : "Left Bank Middle Left",
-<<<<<<< HEAD
-=======
-            "name_datasheeet" : "2nd moving target bottom left bank",
->>>>>>> 362bbd9d368f163913e3f942e6b6006e50881b8f
             "address" : 26,
             "priority" : 2
         },
         {
             "name" : "Left Bank Middle Right",
-<<<<<<< HEAD
-=======
-            "name_datasheeet" : "3rd moving target bottom left bank",
->>>>>>> 362bbd9d368f163913e3f942e6b6006e50881b8f
             "address" : 27,
             "priority" : 2
         },
         {
             "name" : "Left Bank Right",
-<<<<<<< HEAD
-=======
-            "name_datasheeet" : "4th moving target bottom left bank",
->>>>>>> 362bbd9d368f163913e3f942e6b6006e50881b8f
             "address" : 28,
             "priority" : 2
         },
         {
-<<<<<<< HEAD
             "name" : "Special Red",
-=======
-            "name" : "Special red",
-            "name_datasheeet" : "Fixed special red target",
->>>>>>> 362bbd9d368f163913e3f942e6b6006e50881b8f
             "address" : 29,
             "priority" : 2
         },
         {
             "name" : "Special Orange",
-<<<<<<< HEAD
-=======
-            "name_datasheeet" : "Fixed special orange target",
->>>>>>> 362bbd9d368f163913e3f942e6b6006e50881b8f
             "address" : 30,
             "priority" : 2
         },
         {
             "name" : "Right Bank Left",
-<<<<<<< HEAD
-=======
-            "name_datasheeet" : "1st moving target bottom right bank",
->>>>>>> 362bbd9d368f163913e3f942e6b6006e50881b8f
             "address" : 31,
             "priority" : 2
         },
         {
             "name" : "Right Bank Middle",
-<<<<<<< HEAD
-=======
-            "name_datasheeet" : "2nd moving target bottom right bank",
->>>>>>> 362bbd9d368f163913e3f942e6b6006e50881b8f
             "address" : 32,
             "priority" : 2
         },
         {
             "name" : "Right Bank Right",
-<<<<<<< HEAD
-=======
-            "name_datasheeet" : "3rd moving target bottom right bank",
->>>>>>> 362bbd9d368f163913e3f942e6b6006e50881b8f
             "address" : 33,
             "priority" : 2
         },
         {
             "name" : "Spinner",
-<<<<<<< HEAD
-=======
-            "name_datasheeet" : "Spinning target",
->>>>>>> 362bbd9d368f163913e3f942e6b6006e50881b8f
             "address" : 34,
             "priority" : 2
         },
         {
-<<<<<<< HEAD
             "name" : "Canal Button Top",
-=======
-            "name" : "Canal Button Bottom",
-            "name_datasheeet" : "1st Button",
->>>>>>> 362bbd9d368f163913e3f942e6b6006e50881b8f
             "address" : 35,
             "priority" : 2
         },
         {
-<<<<<<< HEAD
             "name" : "Canal Button Middle Top",
-=======
-            "name" : "Canal Button Middle Bottom",
-            "name_datasheeet" : "2nd button",
->>>>>>> 362bbd9d368f163913e3f942e6b6006e50881b8f
             "address" : 36,
             "priority" : 2
         },
         {
             "name" : "Canal Button Middle",
-<<<<<<< HEAD
-=======
-            "name_datasheeet" : "3rd button",
->>>>>>> 362bbd9d368f163913e3f942e6b6006e50881b8f
             "address" : 37,
             "priority" : 2
         },
         {
-<<<<<<< HEAD
             "name" : "Canal Button Middle Bottom",
-=======
-            "name" : "Canal Button Middle Top",
-            "name_datasheeet" : "4th button",
->>>>>>> 362bbd9d368f163913e3f942e6b6006e50881b8f
             "address" : 38,
             "priority" : 2
         },
         {
-<<<<<<< HEAD
             "name" : "Canal Button Bottom",
-=======
-            "name" : "Canal Button Top",
-            "name_datasheeet" : "5th button",
->>>>>>> 362bbd9d368f163913e3f942e6b6006e50881b8f
             "address" : 39,
             "priority" : 2
         },
         {
             "name" : "Top Bank Left",
-<<<<<<< HEAD
-=======
-            "name_datasheeet" : "1st moving target top central bank",
->>>>>>> 362bbd9d368f163913e3f942e6b6006e50881b8f
             "address" : 40,
             "priority" : 2
         },
         {
             "name" : "Top Bank Middle Left",
-<<<<<<< HEAD
-=======
-            "name_datasheeet" : "2nd moving target top central bank",
->>>>>>> 362bbd9d368f163913e3f942e6b6006e50881b8f
             "address" : 41,
             "priority" : 2
         },
         {
             "name" : "Top Bank Middle",
-<<<<<<< HEAD
-=======
-            "name_datasheeet" : "3rd moving target top central bank",
->>>>>>> 362bbd9d368f163913e3f942e6b6006e50881b8f
             "address" : 42,
             "priority" : 2
         },
         {
             "name" : "Top Bank Middle Right",
-<<<<<<< HEAD
-=======
-            "name_datasheeet" : "4th moving target top central bank",
->>>>>>> 362bbd9d368f163913e3f942e6b6006e50881b8f
             "address" : 43,
             "priority" : 2
         },
         {
             "name" : "Top Bank Right",
-<<<<<<< HEAD
-=======
-            "name_datasheeet" : "5th moving target top central bank",
->>>>>>> 362bbd9d368f163913e3f942e6b6006e50881b8f
             "address" : 44,
             "priority" : 2
         },
         {
-<<<<<<< HEAD
             "name" : "Fixed Target 1",
-=======
-            "name" : "Fixed target 1",
-            "name_datasheeet" : "1st fixed target",
->>>>>>> 362bbd9d368f163913e3f942e6b6006e50881b8f
             "address" : 45,
             "priority" : 2
         },
         {
-<<<<<<< HEAD
             "name" : "Fixed Target 2",
-=======
-            "name" : "Fixed target 2",
-            "name_datasheeet" : "2nd fixed target",
->>>>>>> 362bbd9d368f163913e3f942e6b6006e50881b8f
             "address" : 46,
             "priority" : 2
         },
         {
             "name" : "Left Pop",
-<<<<<<< HEAD
-=======
-            "name_datasheeet" : "Top left pop contact",
->>>>>>> 362bbd9d368f163913e3f942e6b6006e50881b8f
             "address" : 47,
             "priority" : 2
         },
         {
             "name" : "Right Pop",
-<<<<<<< HEAD
-=======
-            "name_datasheeet" : "Bottom right pop contact",
->>>>>>> 362bbd9d368f163913e3f942e6b6006e50881b8f
             "address" : 48,
             "priority" : 2
         },
         {
-<<<<<<< HEAD
             "name" : "Fixed Target 5",
-=======
-            "name" : "Fixed target 5",
-            "name_datasheeet" : "5th fixed target",
->>>>>>> 362bbd9d368f163913e3f942e6b6006e50881b8f
             "address" : 49,
             "priority" : 2
         },
         {
-<<<<<<< HEAD
             "name" : "Fixed Target 4",
-=======
-            "name" : "Fixed target 4",
-            "name_datasheeet" : "4th fixed target",
->>>>>>> 362bbd9d368f163913e3f942e6b6006e50881b8f
             "address" : 50,
             "priority" : 2
         },
         {
-<<<<<<< HEAD
             "name" : "Fixed Target 3",
-=======
-            "name" : "Fixed target 3",
-            "name_datasheeet" : "3rd fixed target",
->>>>>>> 362bbd9d368f163913e3f942e6b6006e50881b8f
             "address" : 51,
             "priority" : 2
         },
         {
-<<<<<<< HEAD
             "name" : "Rising ball",
-=======
-            "name" : "Rising Ball",
-            "name_datasheeet" : "Rising ball contact",
->>>>>>> 362bbd9d368f163913e3f942e6b6006e50881b8f
             "address" : 52,
             "priority" : 2
         }