diff --git a/cv4/list_ops.c b/cv4/list_ops.c
index 952779c..d8f0726 100644
--- a/cv4/list_ops.c
+++ b/cv4/list_ops.c
@@ -9,6 +9,15 @@ list_t *new_list(size_t length, list_element_t elements[]) {
         return NULL; 
     }
 
+<<<<<<< HEAD
+=======
+list_t *new_list(size_t length, list_element_t elements[]) {
+    list_t *list = malloc(sizeof(list_t) + length * sizeof(list_element_t));
+    if (!list) {
+        return NULL; 
+    }
+
+>>>>>>> eee4365d7b3f12699d8835f1641480d928f5a060
     list->length = length;
     for (size_t i = 0; i < length; i++) {
         list->elements[i] = elements[i];