fixing .sock file names
fixing merge conflict