Resolved a few conflicts and fixed json serialization