Security Audit — socket — resolving-merge-conflicts