use JSONAware object instead of String data to pass to client
resolve merge conflicts