Fix merge
Fix serialization issue