diff --git a/LICENSE b/LICENSE
index bf244ff..321afb2 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,10 @@
 The MIT License (MIT)
 
+<<<<<<< HEAD
+Copyright (c) 2015 InterSystems Corp.
+=======
 Copyright (c) 2015 Nikita
+>>>>>>> upstream/master
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal