merging changes in public, image is not loaded
merge solved