Fixed a lingering merge error