Fix merge conflicts & update footer links #9

Closed veprice closed 10 months ago