some cat
duplicate
more kittens
merge conflict