http://conflict-resolution.appstor.io 2025-06-13 1.0