new image
resolve conflict