Stashing image changes
Fixing conflicts