Fixed JEVs merge conflicts