Making footer
Making footer again
Resolve conflict