Commits hopefully resolved the merge issues.

missing index.html "uses" section, potentially some styles.css problems.