diff --git a/ab-openldap/checksums.sha256 b/ab-openldap/checksums.sha256
index a85a135..ecf16da 100644
--- a/ab-openldap/checksums.sha256
+++ b/ab-openldap/checksums.sha256
@@ -1,5 +1,12 @@
+<<<<<<< HEAD
 a0f5da182ef4352095e4f82650ed80a527e96a12e11d374a84f89d0a096dda3f  ab-openldap.sh
 68336c195a5605da15e05da6244ccd27864c4703a4d60f652895f863b24ae220  backup.sh
+=======
+5257cbc175e1f35061e419f54c953875597996d887b3c882990319ecc2371bfd  ab-openldap.params.template
+79d96713f2e0a1e9d8c4192077986fc8e6efe805441595d014931ec56163c3c9  ab-openldap.sh
+3818e56bc2eaa33c57a10b4e7bfdee4674df0d9b41ce665d5ca3853ebdd9212b  backup.params.template
+14b11370f980bd10b3cd96ddf3acab73c723f7594127e38d4b90ad09660b5e0a  backup.sh
+>>>>>>> b8ccfdca98d9d1318984dd6093796123465c32b4
 5f228bddbe83bbaa495ad4095a50778c865d3288179148829820b55d00511ca5  update.sh
 e0a20b8eef4e12c1770595c750ee58c0bedb55d0b735756b3637cd17b761e4d8  ab-openldap.params.template
 42d8a45d203bb729d5dadb9fa9a4b597d6f834468f65676a9f0f3cef92831c4c  backup.params.template