http://resolving-conflicts.appstor.io 2025-06-12 1.0