dnzxy 6c682021c8 Fix merge conflicts 2 lat temu
..
MainChartView.swift 6c682021c8 Fix merge conflicts 2 lat temu