brace for merge conflict
merge conflict resolved, I hope
hopefully we are able to close connections, needs testing