chart2: resolve merge conflict.

Change-Id: I5823d03af1eda3963c4ac52b60949402ca81f747