Update #3 on the Web to show conflicts

Change made locally simultaneously.