diff --git a/XDStar-Client/admin.md b/XDStar-Client/admin.md
index ae25a258e8ea22f66640ee960c974e54b52dce98..1563cf6d61d11c40be11d31528af02d313824bf9 100644
--- a/XDStar-Client/admin.md
+++ b/XDStar-Client/admin.md
@@ -141,65 +141,3 @@ All these ClassificationMetaData are defined in the **XDS-Metadata > Classificat
 Thus, through the RegistryObjectList metadata selected in the association of the validation pack, 
 we can check in a message if all the metadata values are valid in the defined context.
 
-<<<<<<< HEAD
-=======
-# How the pack class is managed in the Validator ?
-
-In the **Validator Pack Association**, it’s possible to select a package from the field, pack class. 
-The pack class allows checking a specific element in a message. 
-
-The details of the constraints of these packs are described in the **XDS Documentation > XDS Classes Documentation** section.
-
-![](./media/admin/class_descriptor_pack_class.png)
-![](./media/admin/example_constraint_pack_class.png)
-
-
-### Technical part
-
-All of these constraints are defined in the module **xds-validator** and **xds-ihe-model**.
-The code package in **xds-validator** is generated thanks to the tool **TopCased**.
-
-* The **TopCased** tool is available on gavrinis network, in the trigram YCT.
-  Please, do not modify this project on the server.
-* The **TopCased** documentation is available [here](https://alfresco.ihe-europe.net/share/proxy/alfresco/api/node/content/workspace/SpacesStore/95332aea-ae41-45d7-a305-47f2ba726d1b/Validators-CookBook.pdf) 
-* **xds-validator** is available on subversion : https://scm.gforge.inria.fr/anonscm/svn/gazelle/validators/src-gen/xds-validator-jar/trunk
-* **xds-ihe-model** is available on subversion too : https://scm.gforge.inria.fr/anonscm/svn/gazelle/validators/xds/xds-ihe-model
-
-**How does it work ?**
-
-TopCased is just an older version of Eclipse with several plugins to manage the different constraints. 
-
-In TopCased we open the module **xds-ihe-model**, the model of the constraints are defined in this module thanks to the UML files in the model folder.
-
-![](./media/admin/topcased-constraint.png)
-
-Save the module **xds-ihe-model** in topCased to take into account the changes.
-
-The configuration of the code generates is described in the pom.xml of the module **xds-validator** with the plugin gazelle-generator-jar :
-
-```xml
-<validationDescriptor>
-	<umlpath>${basedir}/../xds-ihe-model/model/ihesubmit.uml</umlpath>
-	<outputFolder>${basedir}/src/main/java/net/ihe/gazelle/ihexds/validator/</outputFolder>
-	<propertiesFile>${basedir}/../xds-ihe-model/chain/default.properties</propertiesFile>
-</validationDescriptor>
-```
-
-Then with the command : 
-```bash
-mvn mbgen: genvalidator
-```
-We generate the package code of the module **xds-validator** from the UML model defined in the module **xds-ihe-model**.
-
-Be careful, do not add your changes directly in the code package of the **xds-validator**, 
-because the code in the **xds-validator** module is based on the UML file defined in the module **xds-ihe-model**. 
-So, if the changes aren’t added in the UML file with topCased, the generation erases the **xds-validator** changes.
-
-On the XDStarClient side, the new pack class is implemented thanks to an INSERT request in the xdstar-client database.
-
-Example :
-```sql
--- Add MUERRORPackValidator in the pack class list
-INSERT INTO pack_class (id, packclass) VALUES (nextval('pack_class_id_seq'), 'net.ihe.gazelle.ihexds.validator.muerror.MUERRORPackValidator');
-```
->>>>>>> d9b0b3a0174902637013f2d74940d43debf9c29b