fixed encoding
merged
fixed encoding after merge