Rollback
Resloving conflicts