Added preventions for conflicting commands