added delete and conflict detection buttons