Finish conversion to merge startegy