more merge conflict resolution. commands previously in commandrules should have been in decorators.py