git-annex automatic merge conflict fix

FitResults/MRI/M01/linhrf_cv1_mhrf_neggain/Slices_29-42/pRF_Sess-AllSessions-avg-cv.variant-aacf.mat

@@ -0,0 +1 @@
+/annex/objects/MD5-s49273039--2e863dc720245a52a46aab3ffa7dd0de