Fix: Correct choosing strategy use on merge