an image conflict bug fixed