fix encoding to new version
merge branches