fixed improperly formated json after rebasing