Made footer sticky
Fixed conflicts