Fix hasConflicts call