Commands Fixes
Non Conflicts