recover conflict