fix merge
fuck dsstore
merge with develop
fix conflict
fix some in markup