v1.0 compatibility
conflict resolution