Add config for marked
Merge branch 'edit'