client added
merge fixed result set null
delete unused image