conflict with images solved