a few vim changes
mergE