infobox, cleaning
image optim, cleaning
merge conflicts
merge conflicts