Fixed a failed merge