Fixed an issue where old a new forum threads were merging on an ID collision, now checks thread type before merging posts into an existing thread.
Merge branch 'master' of https://github.com/Xesyto/Nishkriya