Minor bug fix to properly merge options from .conf file (-c) with command line switches