clean conflict log