Amendment killing nationally legal cannabis makes it into House farm bill