resize image
resolve conflict