edit merge error