Attempting to solve previous merge conflicts
Continued attempt to merge image files...
Merging more images