Stray errorneous merge