Shimmer Image

git rebase vs merge