[git] Git Pull is Not Possible, Unmerged Files