remove bool return in scanConflicts