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