missed merge error