unpack-trees: do not check for conflict entries too early