merge conflict from somewhere
adding vim config line back in