clean conflict