Fixing images's bug
Fixing conflicts