del
conflict rebuild