removed conflict marker from changelog.md
Merge branch 'develop' into feat_tutorial
added tutorials for stock/NEAR and FAR
Merge branch 'feat_tutorial' into develop