modified double images in data.json after merge conflict