IO-2604 Merge in conflicted translations file.

client/src/translations/en_us/common.json

@@ -2436,7 +2436,7 @@
       "fields": {
         "createdby": "Created By",
         "critical": "Critical",
-        "pinned": "",
+        "pinned": "Pinned",
         "private": "Private",
         "text": "Contents",
         "type": "Type",
@@ -2455,7 +2455,7 @@
         "addtorelatedro": "Add to Related ROs",
         "newnoteplaceholder": "Add a note...",
         "notetoadd": "Note to Add",
-        "pinned_note": "",
+        "pinned_note": "Pinned Note",
         "systemnotes": "System Notes",
         "usernotes": "User Notes"
       },
@@ -3890,7 +3890,6 @@
         "state": "Province/State",
         "street1": "Street",
         "street2": "Address 2",
-        "tags": "Tags",
         "taxid": "Tax ID",
         "terms": "Payment Terms",
         "zip": "Zip/Postal Code"