work images take 1
conflict resolution
work page finished