merge with evo