working depolarizing
fixed conflicts'