Encoding Issue Resolved
Conflicts Resolved