The 15 Minute Conflict Resolution Solution