diff --git a/src/main/java/fr/miage/Blockchain.java b/src/main/java/fr/miage/Blockchain.java
index 8873a11a53b04d0128e9c91c62bbcb533e41991f..35b663b72ad6b8ed32da52f4f75b5a85ed2e732b 100644
--- a/src/main/java/fr/miage/Blockchain.java
+++ b/src/main/java/fr/miage/Blockchain.java
@@ -49,15 +49,15 @@ public class Blockchain {
         double amountWalletSender = walletSender.getUtxos().stream().mapToDouble(utxo -> utxo.getMontant()).sum();
         double randomAmountToSend = new Random().nextDouble(amountWalletSender);
 
-        System.out.println("Amount to send : " + randomAmountToSend);
-        System.out.println("Envoie de " + walletSender.getName() + " à " +
-                walletReceiver.getName());
-        System.out.println();
-        System.out.println("Utxos de " + walletSender.getName() + " : " +
-                walletSender.getUtxos());
-        System.out.println("Utxos de " + walletReceiver.getName() + " : " +
-                walletReceiver.getUtxos());
-        System.out.println();
+        // System.out.println("Amount to send : " + randomAmountToSend);
+        // System.out.println("Envoie de " + walletSender.getName() + " à " +
+        // walletReceiver.getName());
+        // System.out.println();
+        // System.out.println("Utxos de " + walletSender.getName() + " : " +
+        // walletSender.getUtxos());
+        // System.out.println("Utxos de " + walletReceiver.getName() + " : " +
+        // walletReceiver.getUtxos());
+        // System.out.println();
         if (walletSender.getUtxos().isEmpty() || walletReceiver.getUtxos().isEmpty()) {
             System.out.println("Wallets vides");
             return;
diff --git a/src/main/java/fr/miage/blocs/Bloc.java b/src/main/java/fr/miage/blocs/Bloc.java
index 4a039eaae3d8133ccfa57a84c8f5d986f49cb308..a55e7a42d744136e329fd4fc91e3ae211575c0ea 100644
--- a/src/main/java/fr/miage/blocs/Bloc.java
+++ b/src/main/java/fr/miage/blocs/Bloc.java
@@ -93,17 +93,19 @@ public class Bloc {
         return new Bloc(hash, transactions);
     }
 
-    BlocHeader blocHeader = new BlocHeader("", Instant.now().toEpochMilli(), 0);
-    String header = blocHeader.toString();
-    String hash = generateHash(header, transactions);return new Bloc(hash,transactions);
-}
-
-    public static Bloc createBloc(List<Transaction> transactions, String previousHash) {
-        BlocHeader blocHeader = new BlocHeader(previousHash, Instant.now().toEpochMilli(), 0);
-        String header = blocHeader.toString();
-        String hash = generateHash(header, transactions);
-        return new Bloc(hash, transactions);
-    }
+    // BlocHeader blocHeader = new BlocHeader("", Instant.now().toEpochMilli(), 0);
+    // String header = blocHeader.toString();
+    // String hash = generateHash(header, transactions);return new
+    // Bloc(hash,transactions);
+
+    // public static Bloc createBloc(List<Transaction> transactions, String
+    // previousHash) {
+    // BlocHeader blocHeader = new BlocHeader(previousHash,
+    // Instant.now().toEpochMilli(), 0);
+    // String header = blocHeader.toString();
+    // String hash = generateHash(header, transactions);
+    // return new Bloc(hash, transactions);
+    // }
 
     private static String generateHash(String header, List<Transaction> transactions) {
         return DigestUtils.sha256Hex(header + transactions.toString());
diff --git a/src/main/java/fr/miage/threads/Mineur.java b/src/main/java/fr/miage/threads/Mineur.java
index 51b47ff928180f6b814fdddde89d13b0a4d653d4..5d930a6f8a35e4a4bc555fdfac0e778b47744596 100644
--- a/src/main/java/fr/miage/threads/Mineur.java
+++ b/src/main/java/fr/miage/threads/Mineur.java
@@ -1,9 +1,6 @@
 package fr.miage.threads;
 
-<<<<<<< HEAD
 import java.security.NoSuchAlgorithmException;
-=======
->>>>>>> bbecea85ece93e9327a7cf897cc7bc8973d7bee6
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -11,10 +8,7 @@ import java.util.List;
 import fr.miage.Blockchain;
 import fr.miage.MinageManager;
 import fr.miage.Transaction;
-<<<<<<< HEAD
 import fr.miage.Wallet;
-=======
->>>>>>> bbecea85ece93e9327a7cf897cc7bc8973d7bee6
 import fr.miage.blocs.Bloc;
 
 public class Mineur extends Thread {
diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000