minor update for main.vimc
merge local changes