diff --git a/getParameters.m b/getParameters.m
index 41931b8..67005e1 100644
--- a/getParameters.m
+++ b/getParameters.m
@@ -3,6 +3,8 @@
 %parameters for a given trial where each row is an individual animal and
 %each column is the chosen parameter on each trial
 
+<<<<<<< HEAD
+=======
 mouseNames = fieldnames(dataSet);
 
 allParameters = {};
@@ -21,6 +23,7 @@
 for i = 1:length(allParameters)
    parameters(i,1:length(allParameters{1,i})) = allParameters{1,i}; 
 end
+>>>>>>> upstream/master
 
 end
 
diff --git a/splitData.m b/splitData.m
index 2a2c66e..589b200 100644
--- a/splitData.m
+++ b/splitData.m
@@ -1,6 +1,22 @@
 function [ control, test ] = splitData( dataSet )
 %SPLITDATA splits a standard AutonoMouse data set into two structures, one
 %for control animals, one for test animals based on NMDA parameter
+<<<<<<< HEAD
+names = fieldnames(dataSet);
+disp(dataSet.(names{1}))
+field_names = fieldnames(dataSet.(names{1}));
+disp(field_names)
+control = struct();
+test = struct();
+for i =1:numel(names)
+    NMDA = dataSet.(names{i}).NMDA;
+    if NMDA == 0
+        control.(names{i})=dataSet.(names{i});
+    else
+        test.(names{i}) = dataSet.(names{i});
+    end
+end
+=======
 
 control = struct();
 test = struct();
@@ -19,3 +35,4 @@
 
 end
 
+>>>>>>> upstream/master