Third Change Commit after Conflict Resolution

This should have cleared the conflict between a change  made on the
website and one made on the computer.