admin images
resolve conflict