Pictures in canvas
Resolving conflict