fix correction from bad merge