add Commands
merge conflict