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