sub
fixed conflicts
isolated the problem