Move amend to basic commands