Fold in changes
Only add logfile=bitmask.log if no logfile was specified