<div id="branch3">
           Simulates a feature included in index.html. 
           Could have used a P but using a DIV with a 
           class to see whether merge clever enough
           to distinguish from other branch DIVs.
        </div>
        <div id="master-feature">
            For testing 3-way merge against DIV feature from branch3.
        </div>
index.html: not merged from branch3, branch3 DIV clashes with master-feature div
index.html: not merged cleanly from branch3, branch3 hacked to include master-feature DIV
Merge commit 'beb2662bda29551966dcbe7c1859ab9cc6cea32d'

Conflicts:
	index.html

Adjusted by NetBeans review and by hand.