base: Fix merge issue