title: Visual tool to resolve merge conflict with PHP Storm?
body: <p>Is there a visual tool to resolve merge conflict with PHP Storm?</p>
  
  <p>I found this documentation but it doesn't seem to be what im after
  <a href="https://www.jetbrains.com/phpstorm/help/resolving-text-conflicts.html" rel="noreferrer">https://www.jetbrains.com/phpstorm/help/resolving-text-conflicts.html</a></p>
  
  <p>I go the menu and go VSC / Git / Resolve conflicts then I get the window below. As you can its not a visual diff. </p>
  
  <p><a href="https://i.stack.imgur.com/ZlQfS.png" rel="noreferrer"><img src="https://i.stack.imgur.com/ZlQfS.png" alt="enter image description here"></a></p>