Special Characters in Merge Conflict Resolution: Resolved an issue where special characters were not properly escaped when saving changes in the merge conflict resolution window.

License Reassignment Displaying Null: Fixed a problem where license reassignment status incorrectly showed as null when the user had never been assigned a license.