Socket finish
Fix conflicts