Actually resolve merge conflicts

crates/ruff/src/importer/insertion.rs

@@ -313,7 +313,7 @@ mod tests {
     fn start_of_file() -> Result<()> {
         fn insert(contents: &str) -> Result<Insertion> {
             let program = Suite::parse(contents, "<filename>")?;
-            let tokens: Vec<LexResult> = ruff_rustpython::tokenize(contents, Mode::Module);
+            let tokens: Vec<LexResult> = ruff_python_parser::tokenize(contents, Mode::Module);
             let locator = Locator::new(contents);
             let stylist = Stylist::from_tokens(&tokens, &locator);
             Ok(Insertion::start_of_file(&program, &locator, &stylist))
@@ -424,7 +424,7 @@ x = 1
     #[test]
     fn start_of_block() {
         fn insert(contents: &str, offset: TextSize) -> Insertion {
-            let tokens: Vec<LexResult> = ruff_rustpython::tokenize(contents, Mode::Module);
+            let tokens: Vec<LexResult> = ruff_python_parser::tokenize(contents, Mode::Module);
             let locator = Locator::new(contents);
             let stylist = Stylist::from_tokens(&tokens, &locator);
             Insertion::start_of_block(offset, &locator, &stylist)

crates/ruff_shrinking/src/main.rs

@@ -276,11 +276,7 @@ impl Strategy for StrategyRemoveToken {
         input: &'a str,
         _ast: &'a Suite,
     ) -> Result<Box<dyn ExactSizeStringIter + 'a>> {
-<<<<<<< HEAD
-        let token_ranges: Vec<_> = ruff_python_parser::tokenize(input)
-=======
-        let token_ranges: Vec<_> = ruff_rustpython::tokenize(input, Mode::Module)
->>>>>>> 023d1dc72 (Use Jupyter mode for the parser with Notebook files)
+        let token_ranges: Vec<_> = ruff_python_parser::tokenize(input, Mode::Module)
             .into_iter()
             // At this point we know we have valid python code
             .map(Result::unwrap)