Delete conflict.txt