git checkout --conflict=merge <FILE>
If git is garbage collecting over and over, try git prune --expire=now
git prune --expire=now