Corrected missed merge error