found earlier merge error