new toolkit version
fixed conflicts