brought back missing strategy, merge should be fine now