Corrected a MERGE mistake

Corrected a MERGE mistake