delete people buttons
resolve conflicts