[NO JIRA] Fix NOTICE file
diff --git a/src/main/dist-bin/NOTICE b/src/main/dist-bin/NOTICE
index 482b7ec..a8becec 100644
--- a/src/main/dist-bin/NOTICE
+++ b/src/main/dist-bin/NOTICE
@@ -41,13 +41,8 @@
----------------------------------------------------------------
-<<<<<<< HEAD
-Apache Commons IO
+Apache Commons IO 2.6
Copyright 2002-2017 The Apache Software Foundation
-=======
-Apache Commons IO 2.2
-Copyright 2002-2012 The Apache Software Foundation
->>>>>>> master-v2
----------------------------------------------------------------
@@ -55,6 +50,11 @@
Copyright 2001-2018 The Apache Software Foundation
----------------------------------------------------------------
+
+Commons Logging 1.2
+Copyright 2003-2014 The Apache Software Foundation
+
+----------------------------------------------------------------
Spring Framework 4.3.26.RELEASE
Copyright (c) 2002-2020 Pivotal, Inc.
