Some residual merge conflicts resulted in errors. Fixed.