fix conflict: merge master and remove marking symbols