Fixed footer
Fixed conflict