re #10772 try to decrease conflicts