fixing json formatting
fixing conflicts