diff --git a/cv4/list_ops.c b/cv4/list_ops.c
index 206ef26..f3b8fee 100644
--- a/cv4/list_ops.c
+++ b/cv4/list_ops.c
@@ -5,6 +5,7 @@ list_t *new_list(size_t length, list_element_t elements[]){
   list_t* list = (list_t*)malloc(sizeof(list_t) + length * sizeof(list_element_t));
   list->length = length;
   memcpy(list->elements,elements, length*sizeof(list_element_t));
+<<<<<<< HEAD
   free(list);
   return list;
 }
@@ -53,4 +54,4 @@ list_t *reverse_list(list_t *list){
 
 void delete_list(list_t *list){
 
-} 
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/cv4/list_ops.h b/cv4/list_ops.h
index e4989fe..a8afcf2 100644
--- a/cv4/list_ops.h
+++ b/cv4/list_ops.h
@@ -1,6 +1,7 @@
 #ifndef LIST_OPS_H
 #define LIST_OPS_H
 
+#include <string.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <string.h>