add merge command
Merge branch 'feature/commands' into develop