fixed image conflict