updating images
fixing conflict