fix conflict jevix filter

18d8f08617babfaccfcdffb92fcb821b62e3c37a