conflict recovered