[Bug 308076] conflicts when updating