Embodiments relate to a computing device retrieving an augmented map comprising a base map, an augmentation to a first map element, and a flag for the augmentation indicating a scope of the augmentation. The computing device receives an updated base map comprising the base map and an update to a second map element. The computing device performs a difference comparison between the augmented map and the updated base map based on the scope indicated by the flag. The computing device determines whether the augmentation and the update conflict based on the difference comparison. The computing device assembles a set of conflicts based on determination.