amchart problem solve
merge conflict solve