diff --git a/Unattend/FullUnattend-srv.xml b/Unattend/FullUnattend-srv.xml
index 1989df5..7cbbd89 100644
--- a/Unattend/FullUnattend-srv.xml
+++ b/Unattend/FullUnattend-srv.xml
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
@@ -65,71 +64,3 @@
-=======
-
-
-
-
- *
- Aston Ecole
- Aston Ecole
- false
-
-
-
-
- fr-fr
- en-us
- en-us
- en-us
-
-
- Aston Ecole
- Aston Ecole
-
-
- Pa$$w0rd
- True
-
-
-
-
- Pa$$w0rd
- True
-
- .
- true
- 1
- Administrateur
-
-
-
- c:\conf\deploy.cmd
- Post Install Script
- 1
-
-
-
- true
-
-
- 32
- 1024
- 768
-
-
-
-
-
- 1
-
-
- false
-
-
- true
-
-
-
-
->>>>>>> DNS
diff --git a/Unattend/Fullunattend-Win10.xml b/Unattend/Fullunattend-Win10.xml
index 3253bfa..8fafe26 100644
--- a/Unattend/Fullunattend-Win10.xml
+++ b/Unattend/Fullunattend-Win10.xml
@@ -148,4 +148,4 @@
Romance Standard Time
-
+
\ No newline at end of file
diff --git a/Unattend/client.xml b/Unattend/client.xml
deleted file mode 100644
index 1d79bed..0000000
--- a/Unattend/client.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-
-
-
-
- 040c:0000040c
- en-us
- en-us
- en-us
- en-us
-
-
- 040c:0000040c
- en-us
- en-us
- fr-FR
- en-us
-
-
- true
-
-
- true
-
-
- 0
-
-
- 0
-
-
- MYCOMPUTER
-
-
-
- MYCOMPUTER
-
-
-
-
-
-
-
- Pa$$w0rd
- true
-
- true
- 1
- AdminLocal
-
-
- true
- true
- true
- true
- Home
- true
- true
- 1
-
-
-
-
-
- Pa$$w0rd
- true
-
- AdminLocal
- AdminLocal
- Administrators
- AdminLocal
-
-
-
-
- Bollocks Corp
- false
-
-
- Control Panel View
- 1
- reg add "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\ControlPanel" /v StartupPage /t REG_DWORD /d 0 /f
- true
-
-
- 2
- Control Panel Icon Size
- false
- reg add "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\ControlPanel" /v AllItemsIconView /t REG_DWORD /d 1 /f
-
-
- Romance Standard Time
-
-
-
-
- Pa$$w0rd
- true
-
- true
- 1
- AdminLocal
-
-
- true
- true
- true
- true
- Home
- true
- true
- 1
-
-
-
-
-
- Pa$$w0rd
- true
-
- AdminLocal
- AdminLocal
- Administrators
- AdminLocal
-
-
-
-
- Bollocks Corp
- false
-
-
- Control Panel View
- 1
- reg add "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\ControlPanel" /v StartupPage /t REG_DWORD /d 0 /f
- true
-
-
- 2
- Control Panel Icon Size
- false
- reg add "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\ControlPanel" /v AllItemsIconView /t REG_DWORD /d 1 /f
-
-
- Romance Standard Time
-
-
-
-
diff --git a/Unattend/server.xml b/Unattend/server.xml
deleted file mode 100644
index 04a5332..0000000
--- a/Unattend/server.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-
-
-
-
- Administrateur
- Pa$$w0rd
-
- Script to install roles
- 1
- powershell -File "C:\Tools\scripts\boot.ps1"
-
-
-
-
-
-
- fr-fr
- en-us
- en-us
- en-us
-
-
- Bollocks Corp
- Bollocks Corp
-
-
- UABhACQAJAB3ADAAcgBkAEEAZABtAGkAbgBpAHMAdAByAGEAdABvAHIAUABhAHMAcwB3AG8AcgBkAA==
- false
-
-
-
- .
- true
- 1
- Administrateur
-
- UABhACQAJAB3ADAAcgBkAFAAYQBzAHMAdwBvAHIAZAA=
- false
-
-
-
-
- c:\conf\deploy.cmd
- Post Install Script
- 1
-
-
- 2
- powershell -File "C:\tools\scripts\boot.ps1"
-
-
-
- true
-
-
- 32
- 1024
- 768
-
-
-
-
-
- 1
-
-
- false
-
-
- true
-
-
-
-