merge error fixed, charts updated