adding a parrot
merge changes