Corrected merge error