add custom text object plugins to .vimrc
resolve conflicts