fixed list view controller image
fixed merge