Corrected merge