Delete conflicts.txt