add vim fileencod utf8
merge changes