add merge
merge with no-ff
gvim is allright