Fixed little merge error