Fix docs/reference/glossary/quantity.md page showing exception (#11374)

* Update quantity.md

* Update

* Update quantity.md

* Update quantity.md

* fix netlify errors

content/en/docs/reference/glossary/quantity.md

@@ -1,36 +1,3 @@
-<<<<<<< HEAD
----
-title: Quantity
-id: quantity
-date: 2018-08-07
-full_link:
-short_description: >
-  A whole-number representation of small or large numbers using SI suffixes.
-
-aka: 
-tags:
----
- A whole-number representation of small or large numbers using SI suffixes.
-
-<!--more--> 
-
-Quantities are representations of small or large numbers using a compact,
-whole-number notation with SI suffixes.  Fractional numbers are represented
-using milli-units, while large numbers can be represented using kilo-units,
-mega-units, giga-units, etc.
-
-For instance, the number `1.5` is represented `1500m`, while the number `1000`
-can be represented as `1k`, and `1000000` as `1M`. You can also specify
-binary-notation suffixes; the number 2048 can be written as `2Ki`.
-
-The accepted decimal (power-of-10) units are `m` (milli), `k` (kilo,
-intentionally lowercase), `M` (mega), `G` (giga), `T` (terra), `P` (peta),
-`E` (exa).
-
-The accepted binary (power-of-2) units are `Ki` (kibi), `Mi` (mebi), `Gi` (gibi),
-`Ti` (tebi), `Pi` (pebi), `Ei` (exbi).
-||||||| merged common ancestors
-=======
 ---
 title: Quantity
 id: quantity
@@ -62,4 +29,4 @@ intentionally lowercase), `M` (mega), `G` (giga), `T` (terra), `P` (peta),
 
 The accepted binary (power-of-2) units are `Ki` (kibi), `Mi` (mebi), `Gi` (gibi),
 `Ti` (tebi), `Pi` (pebi), `Ei` (exbi).
->>>>>>> master
+