new note
dev config
Merge branch 'dev'
config dev