Delete commit conflict headers and footer. Consolidate conflicted button on ONLINE TESTS section.