@@ -1,3 +1,7 @@
# NHP-PRF
+<<<<<<< HEAD
Population receptive fields in non-human primates from whole-brain fMRI and large-scale neurophysiology in visual cortex.
+=======
+Population receptive fields in non-human primates from whole-brain fMRI and large-scale neurophysiology in visual cortex.
+>>>>>>> refs/remotes/origin/master