Footer links
Conflict fix