socket configs
conflict resolved
Merge branch 'newconfigs'
merging …:q
:q
t