fix-up commit
Merge branch 'fix-up'
mainline commits
feature2 stuff
Merge branch 'feature2'
blah
feature3
mainline
feature4
merge conflict resolution
main
feature
Revert "main"

This reverts commit 69cc7326ffb715afc822682291768b5b077c2e61.

Conflicts:
	index.html
foo1

foo2
Update index.html