handle conflict
conflict again