serialization should be working now. make sure to clean your projects before/after merging branches.