Shimmer Image

resolving git conflicts