Fixed a little merge issue