git How to resolve a Git “CONFLICT (modify/delete)”?