update genesis
fix conflict