Conflict file deleted