85xx: Fix merge duplication