add checkConflict method