Images DO WORK ! Banzai !
Fixed conflicts