diff --git a/interface/resources/controllers/hydra.json b/interface/resources/controllers/hydra.json
index 25c8db61cb..c20d54b7c1 100644
--- a/interface/resources/controllers/hydra.json
+++ b/interface/resources/controllers/hydra.json
@@ -23,6 +23,9 @@
         { "from": "Hydra.R1", "to": "Standard.X" },
         { "from": "Hydra.R2", "to": "Standard.A" }, 
         { "from": "Hydra.R3", "to": "Standard.B" }, 
-        { "from": "Hydra.R4", "to": "Standard.Y" }
-    ]
+        { "from": "Hydra.R4", "to": "Standard.Y" },
+
+        { "from": "Hydra.LeftHand", "to": "Standard.LeftHand" }, 
+        { "from": "Hydra.RightHand", "to": "Standard.RightHand" }
+  ]
 }
diff --git a/interface/resources/controllers/standard.json b/interface/resources/controllers/standard.json
index 364d24ae16..b662e5394d 100644
--- a/interface/resources/controllers/standard.json
+++ b/interface/resources/controllers/standard.json
@@ -36,6 +36,8 @@
             "from": "Standard.LT", 
             "to": "Actions.BOOM_OUT", 
             "filters": [ { "type": "scale", "scale": 0.1 } ]
-        }
+        },
+        { "from": "Standard.LeftHand", "to": "Actions.LEFT_HAND" }, 
+        { "from": "Standard.RightHand", "to": "Actions.RIGHT_HAND" }
     ]
 }
diff --git a/libraries/controllers/src/controllers/UserInputMapper.h b/libraries/controllers/src/controllers/UserInputMapper.h
index e9b6c59596..7561ba84af 100644
--- a/libraries/controllers/src/controllers/UserInputMapper.h
+++ b/libraries/controllers/src/controllers/UserInputMapper.h
@@ -174,6 +174,5 @@ Q_DECLARE_METATYPE(QVector<controller::Action>)
 
 // Cheating.
 using UserInputMapper = controller::UserInputMapper;
-//>>>>>>> 9c031b6bef988f123cb955c81299395386ec488c
 
 #endif // hifi_UserInputMapper_h