Fixed yet another incorrect merge