Fixed footer
Fixed Conflicts