Fixed object merge bug with defaults and options