$AEVO Epx merge