Fixing serialization bug caused by git automerge