Updating options merging to actually work.