clear .idea.
.idea add .gitignore
Merge remote-tracking branch 'origin/develop'