resolve conflicts

diff --cc soft/toolbox/jtag_atomic/the_gui.pl
index 161c6a4dbfa0c1704182e8756966aaf74337053b,619a8c9e160796c64f5c3014ad2e309a1233be89..30a449895f30f1b77d5c2b469f9ac098a8ce8afc
--- 1/soft/toolbox/jtag_atomic/the_gui.pl
--- 2/soft/toolbox/jtag_atomic/the_gui.pl
+++ b/soft/toolbox/jtag_atomic/the_gui.pl
@@@ -18,8 -17,8 +18,9 @@@ if(not( -e "/tmp/jtag_initmem")) 
  #use lib "/d/sugar/bneumann/vhdl/jtag_proj/trb_maps_jtag2/ui/";
  #use lib "/d/sugar/bneumann/vhdl/jtag_proj/trb_maps_jtag2/ui/BN/blib/arch";
  
- use lib "libs/blib/arch";
+ use lib "libs/BN/blib/arch";
+ use BN::CRC32;
 +
  #use String::CRC32;
  
  #use feature "state";