Fix merge conflict

Author: TysonAndre

src/Parser.php

@@ -385,17 +385,6 @@ private function eat(...$kinds) {
         return new MissingToken($kinds[0], $token->fullStart);
     }
 
-    /** @param int $kind */
-    private function eat1($kind) {
-        $token = $this->token;
-        if ($token->kind === $kind) {
-            $this->token = $this->lexer->scanNextToken();
-            return $token;
-        }
-        // TODO include optional grouping for token kinds
-        return new MissingToken($kind, $token->fullStart);
-    }
-
     /**
      * Retrieve the current token, and check that it's of the kind $kind.
      * If so, advance and return the token. Otherwise return a MissingToken for