added contact form and fixed some of the issues related to social media
resolved conflicts