Shimmer Image

how to resolve git conflicts