Merging changes and changing user field to be text