IDEX-306. Fixed bug: Project tree and a content of files with conflicts don't updated after merge with conflicts.