Merge changes in Character