changed force chart
changed force chart
merge conflict