Fix merge + text serialization