Fixed issues with merging from Brian-Files