Fixed a merge derp