Add image dimensions
Resolved conflicts