title: Couldn't merge origin/master: error: Your local changes to the following files would be overwritten by merge
body: <p>I make some changes and commits to my project locally but didn't push them, then  I change files in GitHub by adding new file and commit.</p>
  
  <p>when I try to push my local commits android studio suggested to merge but when I try to merge it give me that error and whatever I do keep refusing to merge and show me that message.</p>
  
  <p><a href="https://i.stack.imgur.com/Wxvcx.png" rel="noreferrer"><img src="https://i.stack.imgur.com/Wxvcx.png" alt="enter image description here"></a></p>
  
  <p>and when I click merge shows me.</p>
  
  <p>Error message:</p>
  
  <p><a href="https://i.stack.imgur.com/lCApN.png" rel="noreferrer"><img src="https://i.stack.imgur.com/lCApN.png" alt="enter image description here"></a></p>
  
  <p>My log:</p>
  
  <p><a href="https://i.stack.imgur.com/XPPhe.png" rel="noreferrer"><img src="https://i.stack.imgur.com/XPPhe.png" alt="enter image description here"></a></p>
  
  <p>What should I do?</p>