Fixed the issue that I screwed up in (merging issues)