lint: Fix bad merge conflict