attempted fix for firing command
fixed merge conflict