Part 8: Merge conflict (part1) Update from the web