merge from vix