fix to merging options