Fixed merge conflict and fixed images in mediatableview