views memes
ok
merge conflict fixed