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