changed rhythm to disconnect
fixed merge conflict