Fix merge conflicts

diff --combined grml2usb
index 7d67047,fc3a905..b9df22f
--- 1/grml2usb
--- 2/grml2usb
+++ b/grml2usb
@@@ -525,7 -525,7 +525,7 @@@ def generate_flavour_specific_syslinux_
  
      return("""\
  menu begin grml %(grml_flavour)s
-     menu title Grml %(grml_flavour)s
+     menu title %(grml_flavour)s
      label mainmenu
      menu label ^Back to main menu...
      menu exit
@@@ -955,7 -955,6 +955,7 @@@ def copy_system_files(grml_flavour, iso
      filesystem_module = search_file('filesystem.module', iso_mount)
      if filesystem_module is None:
          logging.critical("Fatal: filesystem.module not found")
 +        raise CriticalException("error locating filesystem.module file")
      else:
          exec_rsync(filesystem_module, squashfs_target + 'filesystem.module')
  
@@@ -965,14 -964,12 +965,14 @@@
      kernel = search_file('linux26', iso_mount)
      if kernel is None:
          logging.critical("Fatal kernel not found")
 +        raise CriticalException("error locating kernel file")
      else:
          exec_rsync(kernel, release_target + '/linux26')
  
      initrd = search_file('initrd.gz', iso_mount)
      if initrd is None:
          logging.critical("Fatal: initrd not found")
 +        raise CriticalException("error locating initrd file")
      else:
          exec_rsync(initrd, release_target + '/initrd.gz')
  
@@@ -1344,7 -1341,18 +1344,18 @@@ def adjust_syslinux_bootoptions(src_nam
  
  
  def add_syslinux_entry(filename, grml_flavour):
-     data = open(filename, "a")
+     data = open(filename, "a+")
+     entry_filename = "option-%s.cfg" % grml_flavour
+     entry = "include %s\n" % entry_filename
+     path = os.path.dirname(filename)
+     for line in data:
+         if line == entry:
+             break
+     else:
+         data.write(entry)
+ 
+     data.close()
+     data = open(path + "/" + entry_filename, "w")
      data.write(generate_flavour_specific_syslinux_config(grml_flavour))
      data.close()
  
@@@ -1386,8 -1394,14 +1397,14 @@@ def handle_syslinux_config(grml_flavour
  
      new_hidden =  "%s-hidden.cfg" % (grml_flavour)
      new_default = "%s-default.cfg" % (grml_flavour)
-     default_file = open("%s/defaults.cfg" % syslinux_target, "a")
-     default_file.write("include %s\n" % new_default)
+     default_file = open("%s/defaults.cfg" % syslinux_target, "a+")
+     entry = "include %s\n" % new_default
+     for line in default_file:
+         if line == entry:
+             break
+     else:
+         default_file.write("include %s\n" % new_default)
+ 
      default_file.close()
      add_syslinux_entry("%s/additional.cfg" % syslinux_target, grml_flavour)