merge clean
more cleanup
World with image
-a
-a
merger fix