fixed bugs with encoding
fixed this-bug
fixed conflicts