loader image

Conflict resolution