Fix faulty conflict resolution

Author: dunglas

contributing/code/core_team.rst

@@ -66,7 +66,7 @@ Active Core Members
   * **Christophe Coevoet** (`stof`_) can merge into all components, bridges and
     bundles;
 
-  * **Kévin Dunglas** (`dunglas`_) can merge into the Serializer_
+  * **Kévin Dunglas** (`dunglas`_) can merge into the PropertyInfo_ and the Serializer_
     component;
 
   * **Abdellatif AitBoudad** (`aitboudad`_) can merge into the Translation_