handle disconnects
merge