ignore ac-comphist.dat
remove conflict