Fix merge for image display