rollback set last id
merge conflicts