change images into assets folder
merge