resolve cache conflicts