Arrange vimrc
Fixed conflict