Author images and css image
merge conflict with imgs in template