image error merge, diff