Bugfix in overridden ActiveRecord#merge