add: add trend curves in time graph
resolve: resolve merge with origin branch