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