chore: resolve conflicts with main

src/api/Cargo.toml

@@ -80,16 +80,14 @@ hmac.workspace = true
 http.workspace = true
 http-body-util.workspace = true
 hyper.workspace = true
-ipaddress.workspace = true
 itertools.workspace = true
+ipaddress.workspace = true
 lettre.workspace = true
 log.workspace = true
 rand.workspace = true
 reqwest.workspace = true
-assign.workspace = true
 ruma.workspace = true
 ruminuwuity.workspace = true
-serde_html_form.workspace = true
 serde_json.workspace = true
 serde.workspace = true
 sha1.workspace = true