Fixed Merge Issue

- Fixed a merge issue with the string.join call