fix conflicts
xsrc, ysrc
Merge pull request #25 from plotly/src

Src