some kind of merge error