Fixed small merge error