Remove merge conflict on user#show.
Change activity to thing on destination#show.
Change activity to thing on destination#show.