Resolve conflicts

src/yaml/adj.all.yaml

@@ -6615,7 +6615,7 @@
   - 00096133-a
 00099000-s:
   definition:
-  - killed; `slain' is formal or literary as in "slain warriors"
+  - killed; `slain' is formal or literary as in `slain warriors'
   example:
   - a picture of St. George and the slain dragon
   ili: i517
@@ -24170,7 +24170,7 @@
   - 00348093-a
 00348809-s:
   definition:
-  - incapable of being changed or moved or undone; e.g. "frozen prices"
+  - incapable of being changed or moved or undone; e.g. `frozen prices'
   example:
   - living on fixed incomes
   ili: i1928
@@ -50856,7 +50856,7 @@
   - 00731008-a
 00732270-s:
   definition:
-  - (of a binary operation) independent of order; as in e.g. "a x b = b x a"
+  - "(of a binary operation) independent of order; as in e.g.: `a x b' = `b x a'"
   domain_topic:
   - 06009822-n
   ili: i4031
@@ -133392,9 +133392,8 @@
   - 01914420-a
 01915458-s:
   definition:
-  - (of color) discolored by impurities; not bright and clear
+  - (of color) discolored by impurities; not bright and clear; `dirty' is often used in combination
   example:
-  - '"dirty" is often used in combination'
   - a dirty (or dingy) white
   - the muddied grey of the sea
   - muddy colors

src/yaml/adj.pert.yaml

@@ -23068,7 +23068,9 @@
 03013361-a:
   definition:
   - pertaining to or characteristic of a body of rules and principles accepted as
-    axiomatic; e.g. "canonist communism"
+    axiomatic; e.g. `canonist communism'
+  example:
+  - canonist communism
   ili: i17154
   members:
   - canonist

src/yaml/adv.all.yaml

@@ -1295,7 +1295,7 @@
   - left for work long ago
   - he has long since given up mountain climbing
   - This name has long since been forgotten
-  - '"lang syne" is Scottish'
+  - "`lang syne' is Scottish"
   ili: i18268
   members:
   - long ago

src/yaml/noun.act.yaml

@@ -66754,7 +66754,7 @@
   partOfSpeech: n
 01222212-n:
   definition:
-  - promise of reward as in "carrot and stick"
+  - promise of reward as in `carrot and stick'
   example:
   - used the carrot of subsidized housing for the workers to get their vote
   hypernym:
@@ -73509,7 +73509,7 @@
     and rapidly increasing difficulty.
   example:
   - source: https://en.wikipedia.org
-    text: The term "arcade game" is also used to refer to an action video game that
+    text: The term `arcade game' is also used to refer to an action video game that
       was designed to play similarly to an arcade game with frantic, addictive gameplay.
   hypernym:
   - 00459914-n

src/yaml/noun.artifact.yaml

@@ -121501,7 +121501,8 @@
 04612521-n:
   definition:
   - a woolen fabric with a hard textured surface and no nap; woven of worsted yarns
-    "he wore a worsted suit"
+  example:
+  - he wore a worsted suit
   hypernym:
   - 03314753-n
   ili: i61274
@@ -122646,8 +122647,9 @@
 92299310-n:
   definition:
   - a defensive missile designed to shoot down incoming intercontinental ballistic
-    missiles; "the Strategic Arms Limitation Talks placed limits on the deployment
-    of ABMs"
+    missiles
+  example:
+  - the Strategic Arms Limitation Talks placed limits on the deployment of ABMs
   hypernym:
   - 03471094-n
   members:
@@ -122808,7 +122810,7 @@
     sounds.
   example:
   - source: https://en.wikipedia.org
-    text: Guitarists derive their signature sound or "tone" from their choice of instrument,
+    text: Guitarists derive their signature sound or `tone' from their choice of instrument,
       pickups, effects units, and guitar amp.
   hypernym:
   - 03282682-n
@@ -124837,7 +124839,7 @@
   example:
   - The introduction of the tilt barrier seems to have originated in the south, as
     it only became a standard feature of jousting in Germany in the 16th century,
-    and was there called the Italian or "welsch" mode.
+    and was there called the Italian or `welsch' mode.
   hypernym:
   - 02799782-n
   members:
@@ -125457,7 +125459,7 @@
   example:
   - source: https://en.wikipedia.org
     text: Prince William's royal yards are the highest and smallest yards on the ship,
-      are made of wood, and are "lifting yards" that can be raised along a section
+      are made of wood, and are `lifting yards' that can be raised along a section
       of the mast.
   hypernym:
   - 04618033-n
@@ -125558,7 +125560,7 @@
     out, or dug into a hillside.
   example:
   - Dugouts are one of the most ancient types of human housing known to archeologists,
-    and the same methods have evolved into modern "earth shelter" technology.
+    and the same methods have evolved into modern `earth shelter' technology.
   hypernym:
   - 04198638-n
   - 03264208-n
@@ -126072,7 +126074,7 @@
   example:
   - source: https://en.wikipedia.org
     text: Vibratory hammers can either drive in or extract a pile; extraction is commonly
-      used to recover steel "H" piles used in temporary foundation shoring.
+      used to recover steel `H' piles used in temporary foundation shoring.
   hypernym:
   - 92460211-n
   members:
@@ -126180,7 +126182,7 @@
       electronic drum kit, consisting of a set of drum pads mounted on a stand or
       rack in a configuration similar to that of an acoustic drum kit layout, with
       rubberized (Roland, Yamaha, Alesis, for example) or specialized acoustic/electronic
-      cymbals (e.g. Zildjian's "Gen 16").
+      cymbals (e.g. Zildjian's `Gen 16').
   hypernym:
   - 03921556-n
   - 03284064-n
@@ -126938,7 +126940,7 @@
 92461769-n:
   definition:
   - a printing press used for offset printing, in which the inked image is transferred
-    (or "offset") from a plate to a rubber blanket, then to the printing surface.
+    (or `offset') from a plate to a rubber blanket, then to the printing surface.
   example:
   - source: https://en.wikipedia.org
     text: Many modern offset presses use computer-to-plate systems as opposed to the
@@ -127349,7 +127351,7 @@
 92462427-n:
   definition:
   - a sewing machine that binds fabric together using two threads, upper and lower,
-    and "locking" (entwining) them together in the hole in the fabric through which
+    and `locking' (entwining) them together in the hole in the fabric through which
     they pass.
   example:
   - source: https://en.wikipedia.org

src/yaml/noun.attribute.yaml

@@ -26793,8 +26793,7 @@
   partOfSpeech: n
 05102125-n:
   definition:
-  - intellectual depth, penetrating knowledge, keen insight, etc.; "the depth of my
-    feeling"; "the profoundness of the silence"
+  - intellectual depth, penetrating knowledge, keen insight, etc.
   example:
   - the depth of my feeling
   - the profoundness of the silence
@@ -35400,8 +35399,8 @@
   - The state or quality of being contemporary, modern, of the present age.
   example:
   - Most obvious, perhaps, is the contemporariness of her language, for example, when
-    wishing to instil organisational members with "a feel for the modern 1990s arm
-    of brewing."
+    wishing to instil organisational members with `a feel for the modern 1990s arm
+    of brewing.'
   hypernym:
   - 05057819-n
   members:
@@ -35464,9 +35463,9 @@
   definition:
   - The behaviour of a stickler; inflexible adherence to rules.
   example:
-  - '"We, the intellectually curious, may soon find ourselves trapped in a pen, fenced
+  - "`We, the intellectually curious, may soon find ourselves trapped in a pen, fenced
     in by rule-bound sticklerism and overzealous concern for our personal safety,
-    unless we exercise our civil liberties and our curiosity," he declaims.'
+    unless we exercise our civil liberties and our curiosity,' he declaims."
   hypernym:
   - 04679712-n
   - 04667618-n
@@ -36538,8 +36537,8 @@
   - the state or quality of being Scottish.
   example:
   - Indeed the formation of these regiments helped to unite the Highlanders and Lowlanders,
-    and give them a shared sense of "Scottishness", by changing the image of Highlanders
-    from being backward and savage, to being "the very embodiment of Scotland" (which
+    and give them a shared sense of `Scottishness', by changing the image of Highlanders
+    from being backward and savage, to being `the very embodiment of Scotland' (which
     became clearly evident during the Romanticist period in Scotland).
   hypernym:
   - 04923519-n
@@ -36856,7 +36855,7 @@
   - The state or quality of behaving like a troublemaker, often violent; like a rude
     violent person; like a yob.
   example:
-  - True, this is hardly the drink to inspire "Girls Gone Wild" loutishness.
+  - True, this is hardly the drink to inspire `Girls Gone Wild' loutishness.
   hypernym:
   - 04921753-n
   members:
@@ -37068,7 +37067,7 @@
   definition:
   - The state of being able to be dismissed from office.
   example:
-  - The "democratic revolution" emphasized the delegation of authority and the removability
+  - The `democratic revolution' emphasized the delegation of authority and the removability
     of officials, precisely because, as we shall see, neither delegation nor removability
     were much recognized in actual institutions.
   hypernym:

src/yaml/noun.cognition.yaml

@@ -33471,7 +33471,7 @@
   source: plWordNet 4.0
 92439250-n:
   definition:
-  - the scientific philosophy where laws are "induced" from sets of data.
+  - the scientific philosophy where laws are `induced' from sets of data.
   hypernym:
   - 06177044-n
   members:
@@ -33519,8 +33519,8 @@
     have visited Earth and made contact with humans in antiquity and prehistory.
   example:
   - Sagan argued that while many legends, artifacts and purported out-of-place artifacts
-    were cited in support of ancient astronaut theories, "very few require more than
-    passing mention" and could be easily explained with more conventional theories.
+    were cited in support of ancient astronaut theories, `very few require more than
+    passing mention' and could be easily explained with more conventional theories.
   hypernym:
   - 05786951-n
   members:
@@ -33569,7 +33569,7 @@
   definition:
   - the study of Etruscan civilization, especially its artifacts and language.
   example:
-  - Half a century ago, however, Massimo Pallottino, the father figure of modern "Etruscology",
+  - Half a century ago, however, Massimo Pallottino, the father figure of modern `Etruscology',
     demolished this thesis once and for all, and today it is accepted that the origins
     of the Etruscan city states must be found in the internal social transformations
     that took place among the indigenous late prehistoric societies of Etruria in
@@ -33585,7 +33585,7 @@
   - the philology of Classical Sanskrit, Greek and Classical Latin.
   example:
   - Classical philology was a major preoccupation of the 19th-century German education
-    system, which became "the paradigm for higher education" throughout Western culture.
+    system, which became `the paradigm for higher education' throughout Western culture.
   hypernym:
   - 06180756-n
   members:
@@ -34411,7 +34411,7 @@
     religious attitude, opposition to intolerance, and castigation of bigotry.
   example:
   - Declarations of pan-Voltairianism will prove no panacea, but rather simply capture
-    an aspirational bonhomie reflected in "unity" marches that, however impressive,
+    an aspirational bonhomie reflected in `unity' marches that, however impressive,
     conceal seeds of future violent explosions given a still elusive and unfinished
     accounting of the broader equities at play.
   hypernym:
@@ -34482,7 +34482,7 @@
   - An obsolete term for ritualistic act or sequence of acts performed by a person
     with obsessive-compulsive neurosis.
   example:
-  - The conceptual history of "anancasm" in psychiatry remains almost unexplored and
+  - The conceptual history of `anancasm' in psychiatry remains almost unexplored and
     this article will help to remove this deficit.
   hypernym:
   - 05708366-n