Fix conflicts

Author: dantleech

src/Parser.php

@@ -3393,22 +3393,6 @@ private function parseEnumCaseDeclaration($parentNode) {
         return $enumCaseDeclaration;
     }
 
-    private function parseEnumInterfaceClause(EnumDeclaration $enumDeclaration): ?EnumInterfaceClause {
-        $enumInterfaceClause = new EnumInterfaceClause();
-        $enumInterfaceClause->parent = $enumDeclaration;
-        $enumInterfaceClause->implementsKeyword = $this->eatOptional1(TokenKind::ImplementsKeyword);
-
-        if ($enumInterfaceClause->implementsKeyword === null) {
-            return null;
-        }
-
-        $enumInterfaceClause->interfaceNameList =
-            $this->parseQualifiedNameList($enumInterfaceClause);
-        return $enumInterfaceClause;
-    }
-
-
-
     /**
      * @param Node $parentNode
      * @param Token[] $modifiers
@@ -3754,7 +3738,6 @@ private function parseEnumDeclaration($parentNode) {
             $enumDeclaration->enumType = $this->tryParseParameterTypeDeclaration($enumDeclaration)
                 ?: new MissingToken(TokenKind::EnumType, $this->token->fullStart);
         }
-        $enumDeclaration->enumInterfaceClause = $this->parseEnumInterfaceClause($enumDeclaration);
 
         $enumDeclaration->enumInterfaceClause = $this->parseEnumInterfaceClause($enumDeclaration);
         $enumDeclaration->enumMembers = $this->parseEnumMembers($enumDeclaration);