socket ns
fixed conflicts