made some other changes to get a conflict
hmm, that did not work ...