unpack-trees: don't shift conflicts left and right