vim mappings
Fixed merge