fixed broken socket emit from merge