fixed some bugs with the conflict_found flag