Shimmer Image

git merge vs rebase