add kitten picture
merge conflict