fixed vim errors when running in terminal mode
resolved merge conflicts