Removing the json merging stuff, now using a serializer;