Resolving merge conflicts with TS103976 draft