fix: merge with master and fix conflict

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,11 @@
+[ISSUE](https://github.com/erxes/erxes/issues/ISSUE)
+
+### Context
+
+Your context here.  Additionally, any screenshots.  Delete this line.
+
+
+// Delete the below section once completed
+### PR Checklist
+- [ ] Description is clearly stated under Context section
+- [ ] Screenshots and the additional verifications are attached

ui/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [0.12.1](https://github.com/erxes/erxes/compare/0.12.0...0.12.1) (2020-03-09)
+
+
+### Bug Fixes
+
+* **integrations:** invalid check in conversations gmail kind ([0e8cacd](https://github.com/erxes/erxes/commit/0e8cacd))
+
 # [0.12.0](https://github.com/erxes/erxes/compare/0.11.2...0.12.0) (2020-01-08)
 
 

ui/src/modules/inbox/components/conversationDetail/workarea/conversation/Conversation.tsx

@@ -63,7 +63,7 @@ class Conversation extends React.Component<Props, {}> {
     const messages = (conversationMessages || []).slice();
     const firstMessage = messages[0];
 
-    if (kind.includes('nylas' || kind === 'gmail')) {
+    if (kind.includes('nylas') || kind === 'gmail') {
       return (
         <MailConversation
           conversation={conversation}