merge from vendor