title: Android Studio Git-merge won't end after resolve conflict
body: <p>Android Studio Git-merge won't end after resolve conflict.</p>
  
  <p>I pulled code from remote to my local branch and there are some conflicts and android studio ask me to witch code wanna keep or merge. so I decide all my code and select "accept your" and there is many new files.</p>
  
  <p><a href="https://i.stack.imgur.com/OGZyF.jpg" rel="noreferrer"><img src="https://i.stack.imgur.com/OGZyF.jpg" alt="enter image description here"></a></p>
  
  <p>but merge won't end and new file won't come to my local change panel.  I also try this with  "accept-theirs" and the result was same.</p>
  
  <p><a href="https://i.stack.imgur.com/uKFsL.jpg" rel="noreferrer"><img src="https://i.stack.imgur.com/uKFsL.jpg" alt="enter image description here"></a></p>
  
  <p>I always do this and result was OK but I don't know how to manage this issue and why this happens.</p>