Hi Gerardo. Today, the use of AAD groups and filters are the sole constructs for targeting within Intune. These targeting constructs do not allow conflicts so you must carefully design your policies to avoid conflicts and this means possibly dividing the settings up in a different manner than you did with group policy to allow them to merge without conflicts. This is certainly a shift from with a small shift in your policy design, it is doable and manageable. We are currently working hard on designing advanced targeting constructs and thinking about how to possibly add a hierarchy, policy priority, policy merging, and similar constructs as have been traditionally available in group policy. As you can imagine, this is non-trivial and a large shift away from what is available today and thus must be planned and designed very carefully. We have no exact timelines for this and nothing to specifically share about when (or if) we will be delivering this.