BCH: - last conflicts from upstream