merge roclinux vim