merge from vince