created dino catalog

It looks like you have a (git) conflict here. Please check the files and resolve any conflicts.