Removing the need for option_merge