Merging feature-brainloc