Add notes about conflicting boundaries and avoidance.