unnoticed merge error