deleted file conflicts