experimenting vimdiff
experimenting vimdiff
merge with master
fixing a small bug