Fixed images folder
Fixed merge