base

no flymake
no mode setting
test merge