unsubscribe merge tag fix
updated TODO