diff --git a/_data/all.yml b/_data/all.yml
index 77e05417..e1cb13b3 100644
--- a/_data/all.yml
+++ b/_data/all.yml
@@ -13603,4 +13603,8 @@
       fixedinputvelocity: '-1'
       fixedoutputnote: '-1'
       fixedoutputvelocity: '-1'
+<<<<<<< HEAD
       inputchannel: '
+=======
+      inputchannel: '
+>>>>>>> 6d293cffa3b4af5ca18c2304c2c34621a7754d27