diff --git a/LICENSE b/LICENSE
index b347c9c..828c521 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,7 +1,11 @@
 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
diff --git a/src/output.c b/src/output.c
index 7e231ac..91c54ea 100644
--- a/src/output.c
+++ b/src/output.c
@@ -70,7 +70,8 @@ int savenetdata(EN_Project *pr)
     ibuf[0] = MAGICNUMBER;
 
     /*** CODEVERSION replaces VERSION ***/ 
-    ibuf[1] = CODEVERSION;                 
+    //ibuf[1] = CODEVERSION;                 
+    ibuf[1] = 20012;  // keep version at 2.00.12 so that GUI will run 
 
     ibuf[2] = net->Nnodes;
     ibuf[3] = net->Ntanks;