first page commit
style changes
merge conflicts