A categorization for conflicts in model versioning