http://conflict-resolution.appstor.io 2025-04-14 1.0