[packet] resolve conflict