clean all
conflict
cleanup