binutils: Fix merge issue