Fixed missed merge error