Jirga settles boundary dispute between tribes