Add image folder
Fix conflict