fixed merge conflict, added sorting, readded protected and threatened species
fixing merge conflicts