re init
fix conflict