added gif
merged conflicts, background image