use editor lineheight for conflict markers

package.json

@@ -106,7 +106,7 @@
         "c9.ide.run.build": "#0598fff697",
         "c9.ide.run.debug.xdebug": "#61dcbd0180",
         "c9.ide.save": "#4a4a60a004",
-        "c9.ide.scm": "#dbe07b56e0",
+        "c9.ide.scm": "#dbad171e75",
         "c9.ide.terminal.monitor": "#b76f1c9f24",
         "c9.ide.test": "#ba0ed6e586",
         "c9.ide.test.mocha": "#f6cc482886",