merge commands-refactor