Fix small merge error