add zenconding
fix conflict