resolving merge conflict from cherry-pick
images in case list will be blank if no url specified, show error-indicating image if invalid url specified
fix merge conflict from pull