diff --git a/LICENSE.txt b/LICENSE.txt
index 7a4a3ea24..7d6153f86 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -199,4 +199,8 @@
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
-   limitations under the License.
\ No newline at end of file
+<<<<<<< HEAD
+   limitations under the License.
+=======
+   limitations under the License.
+>>>>>>> branch 'master' of https://github.com/MyersResearchGroup/iBioSim.git