diff --git a/LICENSE.txt b/LICENSE.txt
index 7d6153f86..6b0b1270f 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -199,8 +199,5 @@
    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
-<<<<<<< HEAD
    limitations under the License.
-=======
-   limitations under the License.
->>>>>>> branch 'master' of https://github.com/MyersResearchGroup/iBioSim.git
+