resolving git conflicts

crates/projection-irc/src/lib.rs

@@ -726,6 +726,7 @@ async fn handle_incoming_message(
             },
             ClientMessage::Whois { target, nick } => {
                 // todo: finish replpies from the server to the command
+
                 match target {
                     Some(target) => {},
                     None => {}