corrected merge error