fix: conflict

DISCLAIMER

@@ -1,31 +1,63 @@
-# DISCLAIMER
-Account integrity persistence and security are not assured. Expect that funds
-used for account might be lost, as well as any data the account uses.
-
-Use of this service is limited only to **non-sensitive and publicly available
-data**. Users must not use, share, or store any kind of sensitive data like
-health status, provision or payment of healthcare, Personally Identifiable
-Information (PII) and/or Protected Health Information (PHI), etc. under **ANY**
-circumstance.
-
-Administrators for this service can not moderate any information
-used, shared, or stored with this service at any time. Any user that cannot
-abide by this disclaimer and Code of Conduct must refrain from using this service.
-
-The material embodied in this software is provided to you "as-is" and without
-warranty of any kind, express, implied or otherwise, including without
-limitation, any warranty of fitness for a particular purpose. In no event shall
-the any government be liable to you or anyone else for any direct, special, incidental,
-indirect or consequential damages of any kind, or any damages whatsoever,
-including without limitation, loss of profit, loss of use, savings or revenue,
-or the claims of third parties, whether or not any government has
-been advised of the possibility of such loss, however caused and on any theory
-of liability, arising out of or in connection with the possession, use or
-performance of this software.
-
-
-# Disclaimer of Endorsement
-Reference herein to any specific commercial product, process, or service by trade 
-name, trademark, manufacturer, or otherwise, in this Work does not constitute an 
-endorsement, recommendation, or favoring by the any Government and 
-shall not be used for advertising or product endorsement purposes.
+# DISCLAIMER
+Account integrity persistence and security are not assured. Expect that funds
+used for account might be lost, as well as any data the account uses.
+
+Use of this service is limited only to **non-sensitive and publicly available
+data**. Users must not use, share, or store any kind of sensitive data like
+health status, provision or payment of healthcare, Personally Identifiable
+Information (PII) and/or Protected Health Information (PHI), etc. under **ANY**
+circumstance.
+
+Administrators for this service can not moderate any information
+used, shared, or stored with this service at any time. Any user that cannot
+abide by this disclaimer and Code of Conduct must refrain from using this service.
+
+The material embodied in this software is provided to you "as-is" and without
+warranty of any kind, express, implied or otherwise, including without
+limitation, any warranty of fitness for a particular purpose. In no event shall
+the any government be liable to you or anyone else for any direct, special, incidental,
+indirect or consequential damages of any kind, or any damages whatsoever,
+including without limitation, loss of profit, loss of use, savings or revenue,
+or the claims of third parties, whether or not any government has
+been advised of the possibility of such loss, however caused and on any theory
+of liability, arising out of or in connection with the possession, use or
+performance of this software.
+
+
+# Disclaimer of Endorsement
+Reference herein to any specific commercial product, process, or service by trade 
+name, trademark, manufacturer, or otherwise, in this Work does not constitute an 
+endorsement, recommendation, or favoring by the any Government and 
+shall not be used for advertising or product endorsement purposes.
+=======
+# DISCLAIMER
+Account integrity persistence and security are not assured. Expect that funds
+used for account might be lost, as well as any data the account uses.
+
+Use of this service is limited only to **non-sensitive and publicly available
+data**. Users must not use, share, or store any kind of sensitive data like
+health status, provision or payment of healthcare, Personally Identifiable
+Information (PII) and/or Protected Health Information (PHI), etc. under **ANY**
+circumstance.
+
+Administrators for this service can not moderate any information
+used, shared, or stored with this service at any time. Any user that cannot
+abide by this disclaimer and Code of Conduct must refrain from using this service.
+
+The material embodied in this software is provided to you "as-is" and without
+warranty of any kind, express, implied or otherwise, including without
+limitation, any warranty of fitness for a particular purpose. In no event shall
+the any government be liable to you or anyone else for any direct, special, incidental,
+indirect or consequential damages of any kind, or any damages whatsoever,
+including without limitation, loss of profit, loss of use, savings or revenue,
+or the claims of third parties, whether or not any government has
+been advised of the possibility of such loss, however caused and on any theory
+of liability, arising out of or in connection with the possession, use or
+performance of this software.
+
+
+# Disclaimer of Endorsement
+Reference herein to any specific commercial product, process, or service by trade
+name, trademark, manufacturer, or otherwise, in this Work does not constitute an
+endorsement, recommendation, or favoring by the any Government and
+shall not be used for advertising or product endorsement purposes.