reinit modules
fixed conflicts