add newfile newfile1
add newfile2 newfile3
newfile conflict