Remove _image parameter, remove extra fields
resolve conflict