test revert
solve coffict
solver2