diff --git a/LICENSE b/LICENSE
index 828c521..c03f27e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,11 +1,6 @@
 MIT License
 
-<<<<<<< HEAD
-Works are copyright (c) 2018 their respective AUTHORS,
-unless such work is in the Public Domain (again, see AUTHORS)
-=======
 Copyright (c) 2017 Open Water Analytics
->>>>>>> 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