Serialization issue after merge.