Fix linting
vim config merge