jqplot
resolving conflicts