merge units-staging

diff --cc icu4c/source/i18n/unitconverter.cpp
Simple merge

diff --cc icu4c/source/i18n/unitsdata.cpp
index 7d1fb67ed88496c6c9d031c1a0f8593435d01fe4,457533277cd33767e63437e27c84a024ee845a6c..f676caa170d03d3d424af09c685b88b79410e337
--- 1/icu4c/source/i18n/unitsdata.cpp
--- 2/icu4c/source/i18n/unitsdata.cpp
+++ b/icu4c/source/i18n/unitsdata.cpp
@@@ -16,7 -15,16 +16,20 @@@ U_NAMESPACE_BEGI
  
  namespace {
  
++<<<<<<< HEAD
 +using icu::number::impl::DecimalQuantity;
++=======
+ void trimSpaces(CharString& factor, UErrorCode& status){
+    CharString trimmed;
+    for (int i = 0 ; i < factor.length(); i++) {
+        if (factor[i] == ' ') continue;
+ 
+        trimmed.append(factor[i], status);
+    }
+ 
+    factor = std::move(trimmed);
+ }
++>>>>>>> 9bcc4b698ff4b2afbf321188bceff809a27342f2
  
  /**
   * A ResourceSink that collects conversion rate information.

diff --cc icu4c/source/test/intltest/intltest.cpp
Simple merge

diff --cc icu4c/source/test/intltest/unitstest.cpp
Simple merge