Convoy & Indigenous Join; State of Emergency Ends