Delete to resolve conflicts