new init
fix conflict