add person
delete conflict file