fix bad merge conflict resolution

src/parse/macros/lazy_static.rs

@@ -26,8 +26,11 @@ macro_rules! parse_or {
                 Err(err) => {
                     err.cancel();
                     parser.psess.dcx().reset_err_count();
+                    return None;
+                }
+            }
+        }
     }
-
     while parser.token.kind != TokenKind::Eof {
         // Parse a `lazy_static!` item.
         let vis = parse_or!(parse_visibility, rustc_parse::parser::FollowedByType::No);