dunnow
conflict solving
changed image management to dictionary and fixed all files accordingly