[Upg] resolve conflict