Engine code merge fail corrected