drivers: Fix merge conflict