Fixed Merge issue

Fixed the merge issue with Josh as we both edited the same file.