running diff3 on bcachefs-tools.spec

conflict in file bcachefs-tools.spec