delete conflict.txt