Fixes merge conflicts with 16-create-capacitive-wheel-driver