3.7.0 has been merged with 3.7.1 and resolved the conflicts. Important thing is FastChatMCAM is no more having the old style code as its migrated to cention-chatserver.