work vim rc changes
resolved merge conflicts