diff --git a/P4A/src/p4a/ArrayListStd.java b/P4A/src/p4a/ArrayListStd.java
index 4d23f940c0bfbba74c99a2247d01bb3442b04a8c..06eb57dd19b94a9805eea633cd9b0875c2adea52 100644
--- a/P4A/src/p4a/ArrayListStd.java
+++ b/P4A/src/p4a/ArrayListStd.java
@@ -8,11 +8,7 @@ public class ArrayListStd<E> extends ArrayList<E> implements Structure{
 	
 	public ArrayListStd()
 	{
-<<<<<<< HEAD
-		liste = new ArrayListStd<E>();
-=======
 		liste = new ArrayList<E>();
->>>>>>> b0eb80a19a87220e9305a3913f8b3e966756c014
 	}
 	
 	@Override
diff --git a/P4A/src/p4a/LinkedListStd.java b/P4A/src/p4a/LinkedListStd.java
index 82eb62df93071eeefbb7986b836ecae118fd93f5..9efde603ea4f7c094a69fb468e9eb9e7ee00c626 100644
--- a/P4A/src/p4a/LinkedListStd.java
+++ b/P4A/src/p4a/LinkedListStd.java
@@ -8,11 +8,7 @@ private LinkedList<E> liste;
 	
 	public LinkedListStd()
 	{
-<<<<<<< HEAD
-		liste = new LinkedListStd<E>();
-=======
 		liste = new LinkedList<E>();
->>>>>>> b0eb80a19a87220e9305a3913f8b3e966756c014
 	}
 	
 	@Override