Added Links in the Footer
resolved conflicts