[Panda] Resolve file conflict