fixed merge

no longer dependent on lot codes being entered correctly