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