diff --git a/LICENSE b/LICENSE
index dfb00ef..2682ef8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -18,4 +18,8 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
\ No newline at end of file
+<<<<<<< HEAD
+SOFTWARE.
+=======
+SOFTWARE.
+>>>>>>> parent of 3470cf8 (Add initial version of autogenerated stuff)