fix: merge

.gitattributes

@@ -5,6 +5,7 @@
 dataset_1/train_data_compositions_26prims_trainlen__trainlen_1.json filter=lfs diff=lfs merge=lfs -text
 dataset_1/train_data_compositions_26prims_trainlen__trainlen_2.json filter=lfs diff=lfs merge=lfs -text
 dataset_1/train_data_compositions_26prims_trainlen__trainlen_4.json filter=lfs diff=lfs merge=lfs -text
+<<<<<<< HEAD
 
 deepcoder_data_modal/LENGTH_GENERALIZATION_data/medium/all_data_train.json filter=lfs diff=lfs merge=lfs -text
 deepcoder_data_modal/LENGTH_GENERALIZATION_data/medium/all_data_valid.json filter=lfs diff=lfs merge=lfs -text
@@ -13,3 +14,8 @@ deepcoder_data_modal/LENGTH_GENERALIZATION_data/medium/all_data_test.json filter
 deepcoder_data_modal/NONE_data/medium/all_data_train.json filter=lfs diff=lfs merge=lfs -text
 deepcoder_data_modal/NONE_data/medium/all_data_valid.json filter=lfs diff=lfs merge=lfs -text
 
+=======
+deepcoder_data_modal/COMPOSE_NEW_OP_data/small/all_data_train.json filter=lfs diff=lfs merge=lfs -text
+deepcoder_data_modal/COMPOSE_NEW_OP_data/small/all_data_valid.json filter=lfs diff=lfs merge=lfs -text
+deepcoder_data_modal/COMPOSE_NEW_OP_data/small/all_data_test.json filter=lfs diff=lfs merge=lfs -text
+>>>>>>> pr-24

deepcoder_data_modal/COMPOSE_NEW_OP_data/small/all_data_test.json

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8b62b012fb79dd6388e3bed1b74b68b7b9789554710cc4233080fe7d57d4aea2
+size 12705804

deepcoder_data_modal/COMPOSE_NEW_OP_data/small/all_data_train.json

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:93d0a8d5db5f7a43d83b427957707033e9a54500de81ad3eb9608b1520c5b3cb
+size 10941611

deepcoder_data_modal/COMPOSE_NEW_OP_data/small/all_data_valid.json

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e12c190b91db30895c955333e06d0a4c42003775955ddedd0db93eafaf9e0fee
+size 12746265