Modify encoding
Resolve conflict