Force client to reconnect
Fix merge conflicts