quick push
fixes conflicts
orders info.html structure, lays out structure