first commit for vim changes
merge from top