dfeb3bf5df
Also added a substr to the filename for the merge code so it won't error when it's a long name
Also added a substr to the filename for the merge code so it won't error when it's a long name