Added commenting function for blog and link
Resolved conflicts