fix up local
Fix conflicts
add the footer border properly