Gifs controller
Merge