images
fixed footer to clear
merge conflicts resolved