diff --git a/Payroll-Liabilities.md b/Payroll-Liabilities.md
index 0a3da02..b275fd8 100644
--- a/Payroll-Liabilities.md
+++ b/Payroll-Liabilities.md
@@ -1,7 +1,11 @@
 # Monthly/Quarterly/Annual Payroll Liabilities Payments
 **This needs to be done for both Bitnetix and EverWatch, even if there are zero dollars paid.**
 
+<<<<<<< HEAD
 Note that QB used to do this for us.  While it still calculates things (entered manually from paychecks) we have to pay them manually.  I generated a spreadsheet that helps with (and/or verifies) the calculations.  It is [Nextcloud\Eric Loyd\Excel\Payroll Liability Calculator.xlsx](https://cloud.allyandric.com/index.php/f/412031).
+=======
+Note that QB used to do this for us.  While it still calculates things (entered manually from paychecks) we have to pay them manually.  I generated a spreadsheet that helps with (and/or verifies) the calculations.  It is [Nextcloud\Eric Loyd\Excel\Payroll Liability Calculator.xlsx](https://cloud.allyandric.com/index.php/f/412031)
+>>>>>>> 0389ffa (Added link to payroll spreadsheet).
 
 # Table of Contents
 - [Federal](#federal)