[sprint 6] merge delete rollback