secondary merge error