pytest.vim
merge confligs