Upload  images
Resolve conflicts