back to the weird error after the merge: