Refactor tractor merge