neurospin trunk before failed merge into trunk