--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -10498,11 +10498,10 @@
   },
   "FX_CONTENT_CRASH_NOT_SUBMITTED": {
     "alert_emails": ["wmccloskey@mozilla.com"],
     "bug_numbers": [1269961],
     "expires_in_version": "never",
     "kind": "count",
     "releaseChannelCollection": "opt-out",
     "description": "Counts the number of times that about:tabcrashed was unloaded without submitting."
->>>>>>> graft
   }
 }