diff --git a/Quadra.c b/Quadra.c
index 8710a8977ebb9652c7e11615b7b38acc477ae0c8..da42a8b40db8a963992e75b92bfaeefdb66cc7b0 100644
--- a/Quadra.c
+++ b/Quadra.c
@@ -34,7 +34,10 @@ void jogar (int *vet, int *vet_ord, int N)
     {
         scanf ("%d", &x);
         fprintf(log,"%d, ", x);
+<<<<<<< HEAD
         // fprintf(log
+=======
+>>>>>>> 9affe5a6de9096a0db8929f4a188d22881da17c3
         if ((pesqseq(vet, x, N) != 0) || (pesqbin(vet_ord, x, N) != 0))
             i++;
     }
diff --git a/busca.o b/busca.o
index 4966c7712a2bf058db8ca485324678a2cce145a3..152847d8f1d2edc9ebf4733511b200756d6bd3ba 100644
Binary files a/busca.o and b/busca.o differ
diff --git a/libbusca.a b/libbusca.a
index fcb69dc691f74e4b718c8359085470ee5b3ab624..2c7c4c5a1f7bb3c9315d63d722797f7e38e878e0 100644
Binary files a/libbusca.a and b/libbusca.a differ