Fix order merge

Added a support of option values