title: PhpStorm git merge not show conflicts
body: <p>I have a project with two branches. All of them have an <code>X.txt</code> file;</p>
  
  <p>I just make changes for <code>X.txt</code> in branch A, then I commit and push changes.</p>
  
  <p>Then I switch to branch B, merge changes branch A.</p>
  
  <p>But it just overrides the <code>X.txt</code> file. There is no conflict and no Resolve Conflict dialog shown like normal.</p>
  
  <p>I just want the to resolve conflicts, not overrides my files.
  How should I do?</p>
  
  <p>I use BitBucket and PhpStorm for developing my project.</p>