diff --git a/LICENSE.md b/LICENSE.md
index 36157ba..a047257 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -80,4 +80,8 @@ This work is made available under a Creative Commons Attribution-ShareAlike 4.0
 **Attribution** - You must attribute the work as follows: "Original work available at https://door43.org/." Attribution statements in derivative works should not in any way suggest that we endorse you or your use of this work.
 
 **ShareAlike** - If you remix, transform, or build upon the material, you must distribute your contributions under the same license as the original.
+<<<<<<< HEAD
 >>>>>>> 5ca3857cc07f472ae2be563c26847fce995af2c8
+=======
+>>>>>>> 1bcd3bfa8afc3ca2af78b4a96d85797a882c0047
+>>>>>>> 5878f7528c3dd48df564f9e9dc7255d2cb3e1b9d