Upload image
Fix conflicts