add conflicting cells detection