Deleted file with merge conflicts.